1
0
Fork 0

Compare commits

..

No commits in common. "c6f5b57f13e1ad6d5ea912600914c893348f216e" and "a3f661cb664247aec12ad3ec8c80800240e4d600" have entirely different histories.

7 changed files with 15 additions and 111 deletions

View File

@ -523,7 +523,6 @@ STR_NEWS_MENU_DELETE_ALL_MESSAGES :Alle berichten
# About menu
###length 11
STR_ABOUT_MENU_LAND_BLOCK_INFO :Landinformatie
STR_ABOUT_MENU_HELP :Help en handleidingen
STR_ABOUT_MENU_SEPARATOR :
STR_ABOUT_MENU_TOGGLE_CONSOLE :Console in-uitschakelen
STR_ABOUT_MENU_AI_DEBUG :Probleemoplossing AI/spelscript
@ -2125,7 +2124,6 @@ STR_INTRO_MULTIPLAYER :{BLACK}Netwerks
STR_INTRO_GAME_OPTIONS :{BLACK}Spelopties
STR_INTRO_HIGHSCORE :{BLACK}Scoretabel
STR_INTRO_HELP :{BLACK}Help en handleiding
STR_INTRO_CONFIG_SETTINGS_TREE :{BLACK}Instellingen
STR_INTRO_NEWGRF_SETTINGS :{BLACK}NewGRF-instellingen
STR_INTRO_ONLINE_CONTENT :{BLACK}Online inhoud zoeken
@ -2147,7 +2145,6 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE :{BLACK}Speelgoe
STR_INTRO_TOOLTIP_GAME_OPTIONS :{BLACK}Spelopties weergeven
STR_INTRO_TOOLTIP_HIGHSCORE :{BLACK}Scoretabel weergeven
STR_INTRO_TOOLTIP_HELP :{BLACK}Toegang tot documentatie en online-hulpbronnen
STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE :{BLACK}Scherminstellingen
STR_INTRO_TOOLTIP_NEWGRF_SETTINGS :{BLACK}NewGRF-instellingen weergeven
STR_INTRO_TOOLTIP_ONLINE_CONTENT :{BLACK}Zoeken naar nieuwe en aangepaste inhoud om te downloaden
@ -2170,17 +2167,6 @@ STR_ABANDON_GAME_QUERY :{YELLOW}Weet je
STR_ABANDON_SCENARIO_QUERY :{YELLOW}Weet je zeker dat je dit scenario wilt sluiten?
# Help window
STR_HELP_WINDOW_CAPTION :{WHITE}Help en handleidingen
STR_HELP_WINDOW_WEBSITES :{BLACK}Websites
STR_HELP_WINDOW_DOCUMENTS :{BLACK}Documenten
STR_HELP_WINDOW_README :{BLACK}Leesmij
STR_HELP_WINDOW_CHANGELOG :{BLACK}Overzicht van wijzigingen
STR_HELP_WINDOW_KNOWN_BUGS :{BLACK}Bekende fouten
STR_HELP_WINDOW_LICENSE :{BLACK}Licentie
STR_HELP_WINDOW_MAIN_WEBSITE :{BLACK}OpenTTD
STR_HELP_WINDOW_MANUAL_WIKI :{BLACK}Handleiding/wiki
STR_HELP_WINDOW_BUGTRACKER :{BLACK}Een fout rapporteren
STR_HELP_WINDOW_COMMUNITY :{BLACK}Gemeenschap
# Cheat window
STR_CHEATS :{WHITE}Valsspelen
@ -4715,11 +4701,6 @@ STR_AI_SETTINGS_SETTING :{STRING}: {ORAN
# Textfile window
STR_TEXTFILE_JUMPLIST :{WHITE}Inhoud
STR_TEXTFILE_JUMPLIST_TOOLTIP :{BLACK}Met deze lijst kun je snel naar een gedeelte in het weergegeven bestand springen
STR_TEXTFILE_JUMPLIST_ITEM :{WHITE}{STRING}
STR_TEXTFILE_NAVBACK_TOOLTIP :{BLACK}Terug in de bladergeschiedenis
STR_TEXTFILE_NAVFORWARD_TOOLTIP :{BLACK}Vooruit in de bladergeschiedenis
STR_TEXTFILE_WRAP_TEXT :{WHITE}Tekst afbreken
STR_TEXTFILE_WRAP_TEXT_TOOLTIP :{BLACK}Tekst aanpassen aan venster zodat je niet hoeft te bladeren
STR_TEXTFILE_VIEW_README :{BLACK}Leesmij-bestand bekijken
@ -4730,7 +4711,6 @@ STR_TEXTFILE_README_CAPTION :{WHITE}{STRING}
STR_TEXTFILE_CHANGELOG_CAPTION :{WHITE}{STRING} wijzigingen van {STRING}
STR_TEXTFILE_LICENCE_CAPTION :{WHITE}{STRING} licentie van {STRING}
STR_TEXTFILE_SURVEY_RESULT_CAPTION :{WHITE}Voorbeeld van resultaten van onderzoek
STR_TEXTFILE_GAME_MANUAL_CAPTION :{WHITE}OpenTTD-document '{STRING}'
# Vehicle loading indicators

View File

@ -524,7 +524,6 @@ STR_NEWS_MENU_DELETE_ALL_MESSAGES :Apagar todas as
# About menu
###length 11
STR_ABOUT_MENU_LAND_BLOCK_INFO :Informações do terreno
STR_ABOUT_MENU_HELP :Ajuda & manuais
STR_ABOUT_MENU_SEPARATOR :
STR_ABOUT_MENU_TOGGLE_CONSOLE :Mostrar/Ocultar consola
STR_ABOUT_MENU_AI_DEBUG :Depuração da IA/Scripts de jogo
@ -2126,7 +2125,6 @@ STR_INTRO_MULTIPLAYER :{BLACK}Multi-jo
STR_INTRO_GAME_OPTIONS :{BLACK}Opções de jogo
STR_INTRO_HIGHSCORE :{BLACK}Tabela de classificações
STR_INTRO_HELP :{BLACK}Ajuda & Manuais
STR_INTRO_CONFIG_SETTINGS_TREE :{BLACK}Definições
STR_INTRO_NEWGRF_SETTINGS :{BLACK}Definições de NewGRF
STR_INTRO_ONLINE_CONTENT :{BLACK}Verificar conteúdo online
@ -2148,7 +2146,6 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE :{BLACK}Selecion
STR_INTRO_TOOLTIP_GAME_OPTIONS :{BLACK}Mostrar opções de jogo
STR_INTRO_TOOLTIP_HIGHSCORE :{BLACK}Mostrar tabela de classificações
STR_INTRO_TOOLTIP_HELP :{BLACK}Obter acesso a documentação e recursos online
STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE :{BLACK}Mostrar definições
STR_INTRO_TOOLTIP_NEWGRF_SETTINGS :{BLACK}Mostrar definições de NewGRF
STR_INTRO_TOOLTIP_ONLINE_CONTENT :{BLACK}Verificar conteúdo novo e actualizado para descarga
@ -2171,17 +2168,6 @@ STR_ABANDON_GAME_QUERY :{YELLOW}Tem a c
STR_ABANDON_SCENARIO_QUERY :{YELLOW}Tem a certeza que deseja abandonar este cenário?
# Help window
STR_HELP_WINDOW_CAPTION :{WHITE}Ajuda & Manuais
STR_HELP_WINDOW_WEBSITES :{BLACK}Páginas de Internet
STR_HELP_WINDOW_DOCUMENTS :{BLACK}Documentos
STR_HELP_WINDOW_README :{BLACK}Leia-me
STR_HELP_WINDOW_CHANGELOG :{BLACK}Registo de alterações
STR_HELP_WINDOW_KNOWN_BUGS :{BLACK}Erros Conhecidos
STR_HELP_WINDOW_LICENSE :{BLACK}Licença
STR_HELP_WINDOW_MAIN_WEBSITE :{BLACK}OpenTTD
STR_HELP_WINDOW_MANUAL_WIKI :{BLACK}Manual / Wiki
STR_HELP_WINDOW_BUGTRACKER :{BLACK}Reportar um erro
STR_HELP_WINDOW_COMMUNITY :{BLACK}Comunidade
# Cheat window
STR_CHEATS :{WHITE}Truques
@ -2594,7 +2580,7 @@ STR_CONTENT_SELECT_UPDATES_CAPTION :{BLACK}Sel. act
STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP :{BLACK}Marcar todo o conteúdo que seja actualização ao conteúdo existente a ser descarregado
STR_CONTENT_UNSELECT_ALL_CAPTION :{BLACK}Desseleccionar tudo
STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP :{BLACK}Marcar todo o conteúdo que não deva ser descarregado
STR_CONTENT_SEARCH_EXTERNAL :{BLACK}Pesquisar "sites" externos
STR_CONTENT_SEARCH_EXTERNAL :{BLACK}Pesquisar sites externos
STR_CONTENT_SEARCH_EXTERNAL_TOOLTIP :{BLACK}Escolher conteudo não disponivel no serviço de conteúdo do OpenTTD em sites não associados ao OpenTTD
STR_CONTENT_SEARCH_EXTERNAL_DISCLAIMER_CAPTION :{WHITE}Está a sair do OpenTTD!
STR_CONTENT_SEARCH_EXTERNAL_DISCLAIMER :{WHITE}Os termos e condições para o download de conteúdo de sites externos variam.{}Terá que se referir aos sites externos para instruções em como instalar o conteúdo no OpenTTD.{}Pretende continuar?
@ -4716,11 +4702,6 @@ STR_AI_SETTINGS_SETTING :{STRING}: {ORAN
# Textfile window
STR_TEXTFILE_JUMPLIST :{WHITE}Índice de Conteúdo
STR_TEXTFILE_JUMPLIST_TOOLTIP :{BLACK}Saltar rapidamente para uma secção do ficheiro exibido através desta lista
STR_TEXTFILE_JUMPLIST_ITEM :{WHITE}{STRING}
STR_TEXTFILE_NAVBACK_TOOLTIP :{BLACK}Recuar no histórico de navegação
STR_TEXTFILE_NAVFORWARD_TOOLTIP :{BLACK}Avançar no histórico de navegação
STR_TEXTFILE_WRAP_TEXT :{WHITE}Envolver o texto
STR_TEXTFILE_WRAP_TEXT_TOOLTIP :{BLACK}Envolve o texto da janela de forma que não é necessário deslizar listagem
STR_TEXTFILE_VIEW_README :{BLACK}Ver leia-me
@ -4731,7 +4712,6 @@ STR_TEXTFILE_README_CAPTION :{WHITE}Leiame {
STR_TEXTFILE_CHANGELOG_CAPTION :{WHITE}Lista de alterações {STRING} de {STRING}
STR_TEXTFILE_LICENCE_CAPTION :{WHITE}Licença {STRING} de {STRING}
STR_TEXTFILE_SURVEY_RESULT_CAPTION :{WHITE}Pré-visualização do resultado da sondagem
STR_TEXTFILE_GAME_MANUAL_CAPTION :{WHITE}OpenTTD documento '{STRING}'
# Vehicle loading indicators

View File

@ -523,7 +523,6 @@ STR_NEWS_MENU_DELETE_ALL_MESSAGES :Șterge toate m
# About menu
###length 11
STR_ABOUT_MENU_LAND_BLOCK_INFO :Informaţii despre teren
STR_ABOUT_MENU_HELP :Ajutor și manuale
STR_ABOUT_MENU_SEPARATOR :
STR_ABOUT_MENU_TOGGLE_CONSOLE :Consolă pornit/oprit
STR_ABOUT_MENU_AI_DEBUG :Depanare Inteligenţă Artificială / Script Joc
@ -2124,7 +2123,6 @@ STR_INTRO_MULTIPLAYER :{BLACK}Multipla
STR_INTRO_GAME_OPTIONS :{BLACK}Opțiuni
STR_INTRO_HIGHSCORE :{BLACK}Tabela cu scoruri maxime
STR_INTRO_HELP :{BLACK}Ajutor și manuale
STR_INTRO_CONFIG_SETTINGS_TREE :{BLACK}Setări
STR_INTRO_NEWGRF_SETTINGS :{BLACK}Setări NewGRF
STR_INTRO_ONLINE_CONTENT :{BLACK}Resurse online
@ -2146,7 +2144,6 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE :{BLACK}Alege pe
STR_INTRO_TOOLTIP_GAME_OPTIONS :{BLACK}Afişează opţiunile jocului
STR_INTRO_TOOLTIP_HIGHSCORE :{BLACK}Afișează tabela cu scoruri maxime
STR_INTRO_TOOLTIP_HELP :{BLACK}Obțineți acces la documentație și resurse online
STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE :{BLACK}Setări afişare
STR_INTRO_TOOLTIP_NEWGRF_SETTINGS :{BLACK}Afişează setările NewGRF
STR_INTRO_TOOLTIP_ONLINE_CONTENT :{BLACK}Verifică dacă există resurse noi sau actualizate pentru descărcare
@ -2169,17 +2166,6 @@ STR_ABANDON_GAME_QUERY :{YELLOW}Sigur v
STR_ABANDON_SCENARIO_QUERY :{YELLOW}Sigur vrei să renunți la acest scenariu?
# Help window
STR_HELP_WINDOW_CAPTION :{WHITE}Ajutor și manuale
STR_HELP_WINDOW_WEBSITES :{BLACK}Site-uri web
STR_HELP_WINDOW_DOCUMENTS :{BLACK}Documente
STR_HELP_WINDOW_README :{BLACK}Citiți-mă
STR_HELP_WINDOW_CHANGELOG :{BLACK}Jurnalul modificărilor
STR_HELP_WINDOW_KNOWN_BUGS :{BLACK}Erori cunoscute
STR_HELP_WINDOW_LICENSE :{BLACK}Licență
STR_HELP_WINDOW_MAIN_WEBSITE :{BLACK}OpenTTD
STR_HELP_WINDOW_MANUAL_WIKI :{BLACK}Manual / Wiki
STR_HELP_WINDOW_BUGTRACKER :{BLACK}Raportați o eroare
STR_HELP_WINDOW_COMMUNITY :{BLACK}Comunitate
# Cheat window
STR_CHEATS :{WHITE}Cheat-uri
@ -4714,9 +4700,6 @@ STR_AI_SETTINGS_SETTING :{STRING}: {ORAN
# Textfile window
STR_TEXTFILE_JUMPLIST :{WHITE}Cuprins
STR_TEXTFILE_JUMPLIST_TOOLTIP :{BLACK}Săriți rapid la o secțiune din fișierul afișat prin această listă
STR_TEXTFILE_JUMPLIST_ITEM :{WHITE}{STRING}
STR_TEXTFILE_WRAP_TEXT :{WHITE}Încadrează textul
STR_TEXTFILE_WRAP_TEXT_TOOLTIP :{BLACK}Încadrează textul ferestrei ca să fie vizibil integral, fără derulare
STR_TEXTFILE_VIEW_README :{BLACK}Vezi fișierul readme
@ -4727,7 +4710,6 @@ STR_TEXTFILE_README_CAPTION :{WHITE}{STRING}
STR_TEXTFILE_CHANGELOG_CAPTION :{WHITE}{STRING}, lista de modificări a {STRING}
STR_TEXTFILE_LICENCE_CAPTION :{WHITE}{STRING}, licența fișierului {STRING}
STR_TEXTFILE_SURVEY_RESULT_CAPTION :{WHITE}Previzualizare a rezultatului sondajului
STR_TEXTFILE_GAME_MANUAL_CAPTION :{WHITE}Deschide document OpenTTD '{STRING}'
# Vehicle loading indicators

View File

@ -524,7 +524,6 @@ STR_NEWS_MENU_DELETE_ALL_MESSAGES :Tüm mesajları
# About menu
###length 11
STR_ABOUT_MENU_LAND_BLOCK_INFO :Arazi bilgisi
STR_ABOUT_MENU_HELP :Yardım & Kılavuzlar
STR_ABOUT_MENU_SEPARATOR :
STR_ABOUT_MENU_TOGGLE_CONSOLE :Konsolu aç/kapa
STR_ABOUT_MENU_AI_DEBUG :YZ/Oyun betik hata ayıklama
@ -1428,8 +1427,6 @@ STR_CONFIG_SETTING_PLANE_CRASHES_NONE :Hiç
STR_CONFIG_SETTING_PLANE_CRASHES_REDUCED :Azaltılmış
STR_CONFIG_SETTING_PLANE_CRASHES_NORMAL :Normal
STR_CONFIG_SETTING_CROSSING_WITH_COMPETITOR :Rakiplere ait karayolları veya demiryolları ile hemzemin geçitlere izin ver: {STRING}
STR_CONFIG_SETTING_CROSSING_WITH_COMPETITOR_HELPTEXT :Rakiplerin sahip olduğu yol veya raylarda hemzemin geçitlerin inşasına izin verilmesi
STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD :Kasabaların sahip olduğu yollarda arabalı yol duraklarına izin ver: {STRING}
STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD_HELPTEXT :Kasabaların sahip olduğu yollarda arabalı yol duraklarının inşasına izin ver
@ -2126,7 +2123,6 @@ STR_INTRO_MULTIPLAYER :{BLACK}Çok Oyu
STR_INTRO_GAME_OPTIONS :{BLACK}Seçenekler
STR_INTRO_HIGHSCORE :{BLACK}Puan Tablosu
STR_INTRO_HELP :{BLACK}Yardım ve Kılavuzlar
STR_INTRO_CONFIG_SETTINGS_TREE :{BLACK}Ayarlar
STR_INTRO_NEWGRF_SETTINGS :{BLACK}NewGRF Ayarları
STR_INTRO_ONLINE_CONTENT :{BLACK}Çevrimiçi İçeriği Kontrol Et
@ -2148,7 +2144,6 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE :{BLACK}'Oyuncak
STR_INTRO_TOOLTIP_GAME_OPTIONS :{BLACK}Seçenekleri göster
STR_INTRO_TOOLTIP_HIGHSCORE :{BLACK}Puan tablosunu göster
STR_INTRO_TOOLTIP_HELP :{BLACK}Belgelere ve çevrimiçi kaynaklara erişin
STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE :{BLACK}Görüntü ayarları
STR_INTRO_TOOLTIP_NEWGRF_SETTINGS :{BLACK}NewGRF ayarlarını göster
STR_INTRO_TOOLTIP_ONLINE_CONTENT :{BLACK}İndirilecek yeni ve güncellenmiş içeriği kontrol et
@ -2171,17 +2166,6 @@ STR_ABANDON_GAME_QUERY :{YELLOW}Bu oyun
STR_ABANDON_SCENARIO_QUERY :{YELLOW}Bu senaryoyu terk etmek istediğinize emin misiniz?
# Help window
STR_HELP_WINDOW_CAPTION :{WHITE}Yardım & Kılavuzlar
STR_HELP_WINDOW_WEBSITES :{BLACK}Websiteler
STR_HELP_WINDOW_DOCUMENTS :{BLACK}Belgeler
STR_HELP_WINDOW_README :{BLACK}Beni oku
STR_HELP_WINDOW_CHANGELOG :{BLACK}Değişiklik günlüğü
STR_HELP_WINDOW_KNOWN_BUGS :{BLACK}Bilinen Hatalar
STR_HELP_WINDOW_LICENSE :{BLACK}Lisans
STR_HELP_WINDOW_MAIN_WEBSITE :{BLACK}OpenTTD
STR_HELP_WINDOW_MANUAL_WIKI :{BLACK}Kılavuz / Wiki
STR_HELP_WINDOW_BUGTRACKER :{BLACK}Hata Bildir
STR_HELP_WINDOW_COMMUNITY :{BLACK}Toplum
# Cheat window
STR_CHEATS :{WHITE}Hileler
@ -4716,11 +4700,6 @@ STR_AI_SETTINGS_SETTING :{STRING}: {ORAN
# Textfile window
STR_TEXTFILE_JUMPLIST :{WHITE}İçerik Tabelası
STR_TEXTFILE_JUMPLIST_TOOLTIP :{BLACK}Bu liste aracılığıyla görüntülenen dosyadaki bir bölüme hızlı bir şekilde atlayın
STR_TEXTFILE_JUMPLIST_ITEM :{WHITE}{STRING}
STR_TEXTFILE_NAVBACK_TOOLTIP :{BLACK}Gezinme geçmişine geri dönme
STR_TEXTFILE_NAVFORWARD_TOOLTIP :{BLACK}Gezinme geçmişinde ileri dönme
STR_TEXTFILE_WRAP_TEXT :{WHITE}Metni kaydır
STR_TEXTFILE_WRAP_TEXT_TOOLTIP :{BLACK}Metni, okumak için gezinmeyi önlemek üzere kaydır
STR_TEXTFILE_VIEW_README :{BLACK}Benioku dosyasını göster
@ -4731,7 +4710,6 @@ STR_TEXTFILE_README_CAPTION :{WHITE}{STRING}
STR_TEXTFILE_CHANGELOG_CAPTION :{WHITE}{STRING} adlı {STRING}'nin değişiklik kaydı
STR_TEXTFILE_LICENCE_CAPTION :{WHITE}{STRING} adlı {STRING}'nin lisansı
STR_TEXTFILE_SURVEY_RESULT_CAPTION :{WHITE}Anket sonucunun önizlemesi
STR_TEXTFILE_GAME_MANUAL_CAPTION :{WHITE}OpenTTD belgesi '{STRING}'
# Vehicle loading indicators

View File

@ -689,9 +689,9 @@ static inline void SetRoadDepotExitDirection(Tile tile, DiagDirection dir)
* @param owner New owner of the depot.
* @param depot_id New depot ID.
* @param dir Direction of the depot exit.
* @param rt Road type of the depot.
* @param rail_type Road type of the depot.
*/
static inline void MakeRoadDepot(Tile tile, Owner owner, DepotID depot_id, DiagDirection dir, RoadType rt)
static inline void MakeRoadDepot(Tile tile, Owner owner, DepotID depot_id, DiagDirection dir, RoadType rail_type)
{
SetTileType(tile, MP_ROAD);
SetTileOwner(tile, owner);
@ -702,7 +702,7 @@ static inline void MakeRoadDepot(Tile tile, Owner owner, DepotID depot_id, DiagD
SB(tile.m6(), 2, 4, 0);
tile.m7() = owner;
tile.m8() = INVALID_ROADTYPE << 6;
SetRoadType(tile, GetRoadTramType(rt), rt);
SetRoadType(tile, GetRoadTramType(rail_type), rail_type);
SetRoadOwner(tile, RTT_TRAM, owner);
}

View File

@ -129,7 +129,7 @@ public:
*/
StringParameters GetRemainingParameters(size_t offset)
{
return StringParameters(this->parameters.subspan(offset, GetDataLeft()));
return StringParameters(this->parameters.subspan(this->offset, GetDataLeft()));
}
/** Return the amount of elements which can still be read. */

View File

@ -199,6 +199,8 @@ void BaseVehicleListWindow::BuildVehicleList()
max_unitnumber = std::max<uint>(max_unitnumber, (*it)->unitnumber);
}
this->unitnumber_digits = CountDigitsForAllocatingSpace(max_unitnumber);
this->FilterVehicleList();
} else {
/* Sort by the primary vehicle; we just want all vehicles that share the same orders to form a contiguous range. */
std::stable_sort(this->vehicles.begin(), this->vehicles.end(), [](const Vehicle * const &u, const Vehicle * const &v) {
@ -222,21 +224,22 @@ void BaseVehicleListWindow::BuildVehicleList()
this->unitnumber_digits = CountDigitsForAllocatingSpace(max_num_vehicles);
}
this->FilterVehicleList();
this->vehgroups.RebuildDone();
this->vscroll->SetCount(this->vehgroups.size());
}
/** Cargo filter functions */
/**
* Check whether a single vehicle should pass the filter.
*
* @param v The vehicle to check.
* @param cid The cargo to filter for.
* @return true iff the vehicle carries the cargo.
* Check whether a vehicle can carry a specific cargo.
* @param vehgroup The vehicle group which contains the vehicle to be checked
* @param cid The cargo what we are looking for
* @return Whether the vehicle can carry the specified cargo or not
*/
static bool CargoFilterSingle(const Vehicle *v, const CargoID cid)
static bool CDECL CargoFilter(const GUIVehicleGroup *vehgroup, const CargoID cid)
{
const Vehicle *v = (*vehgroup).GetSingleVehicle();
if (cid == BaseVehicleListWindow::CF_ANY) {
return true;
} else if (cid == BaseVehicleListWindow::CF_NONE) {
@ -268,25 +271,6 @@ static bool CargoFilterSingle(const Vehicle *v, const CargoID cid)
}
}
/**
* Check whether a vehicle can carry a specific cargo.
*
* @param vehgroup The vehicle group which contains the vehicle to be checked
* @param cid The cargo what we are looking for
* @return Whether the vehicle can carry the specified cargo or not
*/
static bool CargoFilter(const GUIVehicleGroup *vehgroup, const CargoID cid)
{
auto it = vehgroup->vehicles_begin;
/* Check if any vehicle in the group matches; if so, the whole group does. */
for (; it != vehgroup->vehicles_end; it++) {
if (CargoFilterSingle(*it, cid)) return true;
}
return false;
}
static GUIVehicleGroupList::FilterFunction * const _filter_funcs[] = {
&CargoFilter,
};