From caa1a6fdeb40026305f0b11c6d2c209786f93f79 Mon Sep 17 00:00:00 2001 From: rubidium Date: Fri, 20 Jul 2012 19:28:51 +0000 Subject: [PATCH] (svn r24419) [1.2] -Backport from trunk: - Fix: [NewGRF] GetReverseCargoTranslation() was unnecessary complicated and also returned the wrong thing for cargos not present in the translation table (r24273) - Fix: [NewGRF] Load cargo- and railtype-translation during both reservation and activation stage. That way they can be selected using Action7 depending on present cargo- or railtypes (r24272) - Fix: Use the same colour scheme for the script selection window as in other comparable windows (r24268) - Fix: Make the oilrig-vehicle list accessible to spectators and colour its caption neutrally grey [FS#5126] (r24260) --- src/ai/ai_gui.cpp | 6 ++--- src/lang/afrikaans.txt | 6 ++--- src/lang/arabic_egypt.txt | 6 ++--- src/lang/belarusian.txt | 6 ++--- src/lang/brazilian_portuguese.txt | 6 ++--- src/lang/bulgarian.txt | 6 ++--- src/lang/catalan.txt | 6 ++--- src/lang/croatian.txt | 6 ++--- src/lang/czech.txt | 6 ++--- src/lang/danish.txt | 6 ++--- src/lang/dutch.txt | 6 ++--- src/lang/english.txt | 6 ++--- src/lang/english_AU.txt | 6 ++--- src/lang/english_US.txt | 6 ++--- src/lang/esperanto.txt | 6 ++--- src/lang/estonian.txt | 6 ++--- src/lang/finnish.txt | 6 ++--- src/lang/french.txt | 6 ++--- src/lang/galician.txt | 6 ++--- src/lang/german.txt | 6 ++--- src/lang/greek.txt | 6 ++--- src/lang/hebrew.txt | 6 ++--- src/lang/hungarian.txt | 6 ++--- src/lang/icelandic.txt | 6 ++--- src/lang/indonesian.txt | 6 ++--- src/lang/irish.txt | 6 ++--- src/lang/italian.txt | 6 ++--- src/lang/japanese.txt | 6 ++--- src/lang/korean.txt | 6 ++--- src/lang/latvian.txt | 6 ++--- src/lang/lithuanian.txt | 6 ++--- src/lang/luxembourgish.txt | 6 ++--- src/lang/malay.txt | 6 ++--- src/lang/norwegian_bokmal.txt | 6 ++--- src/lang/norwegian_nynorsk.txt | 6 ++--- src/lang/polish.txt | 6 ++--- src/lang/portuguese.txt | 6 ++--- src/lang/romanian.txt | 6 ++--- src/lang/russian.txt | 6 ++--- src/lang/serbian.txt | 6 ++--- src/lang/simplified_chinese.txt | 6 ++--- src/lang/slovak.txt | 6 ++--- src/lang/slovenian.txt | 6 ++--- src/lang/spanish.txt | 6 ++--- src/lang/swedish.txt | 6 ++--- src/lang/traditional_chinese.txt | 6 ++--- src/lang/turkish.txt | 6 ++--- src/lang/ukrainian.txt | 6 ++--- src/lang/unfinished/chuvash.txt | 2 +- src/lang/unfinished/frisian.txt | 4 ++-- src/lang/unfinished/persian.txt | 4 ++-- src/lang/vietnamese.txt | 6 ++--- src/lang/welsh.txt | 6 ++--- src/newgrf.cpp | 38 ++++++++++++++++++++++++------- src/newgrf_cargo.cpp | 15 ------------ src/newgrf_cargo.h | 1 - src/newgrf_industries.cpp | 2 +- src/newgrf_station.cpp | 2 +- src/station_gui.cpp | 8 +++---- src/vehicle_gui.cpp | 14 +++--------- src/vehiclelist.cpp | 8 ++++--- 61 files changed, 199 insertions(+), 199 deletions(-) diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp index 2e7eab65c7..b7d3850308 100644 --- a/src/ai/ai_gui.cpp +++ b/src/ai/ai_gui.cpp @@ -118,13 +118,13 @@ struct AIListWindow : public Window { int y = this->GetWidget(WID_AIL_LIST)->pos_y; /* First AI in the list is hardcoded to random */ if (this->vscroll->IsVisible(0)) { - DrawString(r.left + WD_MATRIX_LEFT, r.right - WD_MATRIX_LEFT, y + WD_MATRIX_TOP, this->slot == OWNER_DEITY ? STR_AI_CONFIG_NONE : STR_AI_CONFIG_RANDOM_AI, this->selected == -1 ? TC_WHITE : TC_BLACK); + DrawString(r.left + WD_MATRIX_LEFT, r.right - WD_MATRIX_LEFT, y + WD_MATRIX_TOP, this->slot == OWNER_DEITY ? STR_AI_CONFIG_NONE : STR_AI_CONFIG_RANDOM_AI, this->selected == -1 ? TC_WHITE : TC_ORANGE); y += this->line_height; } ScriptInfoList::const_iterator it = this->info_list->begin(); for (int i = 1; it != this->info_list->end(); i++, it++) { if (this->vscroll->IsVisible(i)) { - DrawString(r.left + WD_MATRIX_LEFT, r.right - WD_MATRIX_RIGHT, y + WD_MATRIX_TOP, (*it).second->GetName(), (this->selected == i - 1) ? TC_WHITE : TC_BLACK); + DrawString(r.left + WD_MATRIX_LEFT, r.right - WD_MATRIX_RIGHT, y + WD_MATRIX_TOP, (*it).second->GetName(), (this->selected == i - 1) ? TC_WHITE : TC_ORANGE); y += this->line_height; } } @@ -151,7 +151,7 @@ struct AIListWindow : public Window { y += FONT_HEIGHT_NORMAL + WD_PAR_VSEP_NORMAL; } SetDParamStr(0, selected_info->GetDescription()); - DrawStringMultiLine(r.left + WD_FRAMETEXT_LEFT, r.right - WD_FRAMETEXT_RIGHT, y, r.bottom - WD_FRAMERECT_BOTTOM, STR_JUST_RAW_STRING, TC_BLACK); + DrawStringMultiLine(r.left + WD_FRAMETEXT_LEFT, r.right - WD_FRAMETEXT_RIGHT, y, r.bottom - WD_FRAMERECT_BOTTOM, STR_JUST_RAW_STRING, TC_WHITE); } break; } diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index a124782b29..efbaf62929 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -3526,9 +3526,9 @@ STR_AI_LIST_CAPTION_AI :AIs STR_AI_LIST_CAPTION_GAMESCRIPT :Speletjie Skrifte STR_AI_LIST_TOOLTIP :{BLACK}Kliek om 'n skrif te kies -STR_AI_LIST_AUTHOR :{BLACK}Skrywer: {STRING} -STR_AI_LIST_VERSION :{BLACK}Weergawe: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Skrywer: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Weergawe: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Aanvaar STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Kies beligte skrif diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index 14eeb78967..3f21f6ed77 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -3460,9 +3460,9 @@ STR_AI_CONFIG_CONFIGURE_TOOLTIP :{BLACK} اعد # Available AIs window STR_AI_LIST_TOOLTIP :{BLACK} اضغط لاختيار ذكاء اصطناعي -STR_AI_LIST_AUTHOR :{BLACK}المؤلف: {STRING} -STR_AI_LIST_VERSION :{BLACK}الاصدار: {NUM} -STR_AI_LIST_URL :{BLACK}العنوان : {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}المؤلف: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}الاصدار: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}العنوان : {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK} اقبل STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK} اختر الذكاء الصناعي المنتقى diff --git a/src/lang/belarusian.txt b/src/lang/belarusian.txt index f19aceb054..dd4ad1fad1 100644 --- a/src/lang/belarusian.txt +++ b/src/lang/belarusian.txt @@ -3910,9 +3910,9 @@ STR_AI_LIST_CAPTION_AI :модулі Ш STR_AI_LIST_CAPTION_GAMESCRIPT :гульнёвыя скрыпты STR_AI_LIST_TOOLTIP :{BLACK}Пстрыкніце для выбару скрыпту -STR_AI_LIST_AUTHOR :{BLACK}Аўтар: {STRING} -STR_AI_LIST_VERSION :{BLACK}Вэрсiя: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Аўтар: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Вэрсiя: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Выбраць STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Выбраць падсьвечаны скрыпт diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index 8e527e3dc7..9bf18b7992 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -3553,9 +3553,9 @@ STR_AI_LIST_CAPTION_AI :{G=f}IAs STR_AI_LIST_CAPTION_GAMESCRIPT :Script do jogo STR_AI_LIST_TOOLTIP :{BLACK}Clique para selecionar um script -STR_AI_LIST_AUTHOR :{BLACK}Autor: {STRING} -STR_AI_LIST_VERSION :{BLACK}Versão: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Autor: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Versão: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Aceitar STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Selecionar o script destacado diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index 50fcfac75e..e1a57e7b74 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -3370,9 +3370,9 @@ STR_AI_LIST_CAPTION_AI :AI-та STR_AI_LIST_CAPTION_GAMESCRIPT :Програмни езици на играта STR_AI_LIST_TOOLTIP :{BLACK}Кликнете за да изберете AI -STR_AI_LIST_AUTHOR :{BLACK}Автор: {STRING} -STR_AI_LIST_VERSION :{BLACK}Версия: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Автор: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Версия: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Приеми STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Избери маркирания AI diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index 64257691e9..a58176b8f3 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -3553,9 +3553,9 @@ STR_AI_LIST_CAPTION_AI :IAs STR_AI_LIST_CAPTION_GAMESCRIPT :Scripts del Joc STR_AI_LIST_TOOLTIP :{BLACK}Clica per a seleccionar un script -STR_AI_LIST_AUTHOR :{BLACK}Autor: {STRING} -STR_AI_LIST_VERSION :{BLACK}Versió: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Autor: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Versió: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Accepta STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Selecciona l'script realçat diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index 6700aed067..50744527a9 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -3648,9 +3648,9 @@ STR_AI_LIST_CAPTION_AI :UI-jevi STR_AI_LIST_CAPTION_GAMESCRIPT :Skripte Igre STR_AI_LIST_TOOLTIP :{BLACK}Klikni za izbor skripte -STR_AI_LIST_AUTHOR :{BLACK}Autor: {STRING} -STR_AI_LIST_VERSION :{BLACK}Verzija: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Autor: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Verzija: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Prihvati STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Odaberi posvijetljenu skriptu diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 1129c87b26..73adfec743 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -3646,9 +3646,9 @@ STR_AI_LIST_CAPTION_AI :AI STR_AI_LIST_CAPTION_GAMESCRIPT :herní skripty STR_AI_LIST_TOOLTIP :{BLACK}Skript vybereš kliknutím -STR_AI_LIST_AUTHOR :{BLACK}Autor: {STRING} -STR_AI_LIST_VERSION :{BLACK}Verze: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Autor: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Verze: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Potvrdit STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Vybrat označený skript diff --git a/src/lang/danish.txt b/src/lang/danish.txt index 6232e7d878..bcfdedb4d6 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -3552,9 +3552,9 @@ STR_AI_LIST_CAPTION_AI :AIer STR_AI_LIST_CAPTION_GAMESCRIPT :Spilscripts STR_AI_LIST_TOOLTIP :{BLACK}Klik for at vælge et script -STR_AI_LIST_AUTHOR :{BLACK}Skaber: {STRING} -STR_AI_LIST_VERSION :{BLACK}Version: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Skaber: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Version: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Accepter STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Vælg markeret script diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index 7649f401c8..a749b26278 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -3552,9 +3552,9 @@ STR_AI_LIST_CAPTION_AI :AI's STR_AI_LIST_CAPTION_GAMESCRIPT :Game Scripts STR_AI_LIST_TOOLTIP :{BLACK}Klik om een script te selecteren -STR_AI_LIST_AUTHOR :{BLACK}Auteur: {STRING} -STR_AI_LIST_VERSION :{BLACK}Versie: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Auteur: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Versie: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Accepteer STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Selecteer gemarkeerd script diff --git a/src/lang/english.txt b/src/lang/english.txt index 5f206607a8..e8d5630d84 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -3552,9 +3552,9 @@ STR_AI_LIST_CAPTION_AI :AIs STR_AI_LIST_CAPTION_GAMESCRIPT :Game Scripts STR_AI_LIST_TOOLTIP :{BLACK}Click to select a script -STR_AI_LIST_AUTHOR :{BLACK}Author: {RAW_STRING} -STR_AI_LIST_VERSION :{BLACK}Version: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {RAW_STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Author: {ORANGE}{RAW_STRING} +STR_AI_LIST_VERSION :{LTBLUE}Version: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{RAW_STRING} STR_AI_LIST_ACCEPT :{BLACK}Accept STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Select highlighted script diff --git a/src/lang/english_AU.txt b/src/lang/english_AU.txt index 40127faa0d..d2834e7029 100644 --- a/src/lang/english_AU.txt +++ b/src/lang/english_AU.txt @@ -3552,9 +3552,9 @@ STR_AI_LIST_CAPTION_AI :AIs STR_AI_LIST_CAPTION_GAMESCRIPT :Game Scripts STR_AI_LIST_TOOLTIP :{BLACK}Click to select a script -STR_AI_LIST_AUTHOR :{BLACK}Author: {STRING} -STR_AI_LIST_VERSION :{BLACK}Version: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Author: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Version: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Accept STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Select highlighted script diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index 734b60cdd4..de399f9e4c 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -3552,9 +3552,9 @@ STR_AI_LIST_CAPTION_AI :AIs STR_AI_LIST_CAPTION_GAMESCRIPT :Game Scripts STR_AI_LIST_TOOLTIP :{BLACK}Click to select a script -STR_AI_LIST_AUTHOR :{BLACK}Author: {STRING} -STR_AI_LIST_VERSION :{BLACK}Version: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Author: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Version: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Accept STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Select highlighted script diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index 015053fc71..d946ebc381 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -3327,9 +3327,9 @@ STR_AI_CONFIG_CONFIGURE_TOOLTIP :{BLACK}Agordi p # Available AIs window STR_AI_LIST_TOOLTIP :{BLACK}Klaki por elekti AI -STR_AI_LIST_AUTHOR :{BLACK}Aŭtoro: {STRING} -STR_AI_LIST_VERSION :{BLACK}Versio: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Aŭtoro: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Versio: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Akcepti STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Elekti emfazitan AI diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index 6067fb648a..92b956e08c 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -3609,9 +3609,9 @@ STR_AI_LIST_CAPTION_AI :Tehismõistused STR_AI_LIST_CAPTION_GAMESCRIPT :GameScript-id STR_AI_LIST_TOOLTIP :{BLACK}Klõpsa skripti valimiseks -STR_AI_LIST_AUTHOR :{BLACK}Autor: {STRING} -STR_AI_LIST_VERSION :{BLACK}Versioon: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Autor: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Versioon: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Nõustu STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Vali esiletõstetud skript diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 4e0e724a62..be4558257c 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -3552,9 +3552,9 @@ STR_AI_LIST_CAPTION_AI :Tekoälyt STR_AI_LIST_CAPTION_GAMESCRIPT :Peliskriptit STR_AI_LIST_TOOLTIP :{BLACK}Napsauta valitaksesi skriptin -STR_AI_LIST_AUTHOR :{BLACK}Tekijä: {STRING} -STR_AI_LIST_VERSION :{BLACK}Versio: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Tekijä: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Versio: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Hyväksy STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Valitse korostettu skripti diff --git a/src/lang/french.txt b/src/lang/french.txt index b31e89724c..3e0cf76652 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -3553,9 +3553,9 @@ STR_AI_LIST_CAPTION_AI :IA STR_AI_LIST_CAPTION_GAMESCRIPT :Scripts de jeu STR_AI_LIST_TOOLTIP :{BLACK}Cliquer pour sélectionner un script -STR_AI_LIST_AUTHOR :{BLACK}Auteur{NBSP}: {STRING} -STR_AI_LIST_VERSION :{BLACK}Version{NBSP}: {NUM} -STR_AI_LIST_URL :{BLACK}URL{NBSP}: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Auteur{NBSP}: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Version{NBSP}: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL{NBSP}: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Accepter STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Sélectionner le script en surbrillance diff --git a/src/lang/galician.txt b/src/lang/galician.txt index d6b8ebe3be..24350d085e 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -3184,9 +3184,9 @@ STR_AI_CONFIG_CONFIGURE_TOOLTIP :{BLACK}Configur # Available AIs window STR_AI_LIST_TOOLTIP :{BLACK}Pincha para seleccionar unha IA -STR_AI_LIST_AUTHOR :{BLACK}Autor: {STRING} -STR_AI_LIST_VERSION :{BLACK}Versión: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Autor: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Versión: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Aceptar STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Selecciona-la IA marcada diff --git a/src/lang/german.txt b/src/lang/german.txt index 29626ef52d..b3201ccfa8 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -3553,9 +3553,9 @@ STR_AI_LIST_CAPTION_AI :KIs STR_AI_LIST_CAPTION_GAMESCRIPT :Skripte STR_AI_LIST_TOOLTIP :{BLACK}Klicken, um ein Skript auszuwählen -STR_AI_LIST_AUTHOR :{BLACK}Autor: {STRING} -STR_AI_LIST_VERSION :{BLACK}Version: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Autor: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Version: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Anwenden STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Ausgewähltes Skript verwenden diff --git a/src/lang/greek.txt b/src/lang/greek.txt index 4017fd07ad..93f3057502 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -3606,9 +3606,9 @@ STR_AI_LIST_CAPTION_AI :AIs STR_AI_LIST_CAPTION_GAMESCRIPT :Δέσμες ενεργειών Παιχνιδιού STR_AI_LIST_TOOLTIP :{BLACK}Πατήστε για επιλέξετε ένα script -STR_AI_LIST_AUTHOR :{BLACK}Συγγραφέας: {STRING} -STR_AI_LIST_VERSION :{BLACK}Έκδοση: {NUM} -STR_AI_LIST_URL :{BLACK}Ιστιοσελίδα: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Συγγραφέας: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Έκδοση: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}Ιστιοσελίδα: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Αποδοχή STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Αποδοχή του επιλεγμένου script diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index f6551e7116..3a7be40417 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -3267,9 +3267,9 @@ STR_AI_CONFIG_CONFIGURE_TOOLTIP :{BLACK}שנה # Available AIs window STR_AI_LIST_TOOLTIP :{BLACK} לחץ לבחירת בינה מלאכותית -STR_AI_LIST_AUTHOR :{BLACK}יוצר: {STRING} -STR_AI_LIST_VERSION :{BLACK}גרסה: {NUM} -STR_AI_LIST_URL :{BLACK}קישור: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}יוצר: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}גרסה: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}קישור: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}אשר STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK} בחר סוג בינה מלאכותית שהודגש diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index 42ea2753ff..7c9a5eca35 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -3616,9 +3616,9 @@ STR_AI_LIST_CAPTION_AI :MI-k STR_AI_LIST_CAPTION_GAMESCRIPT :Játékszkriptek STR_AI_LIST_TOOLTIP :{BLACK}Kattints ide a szkript kiválasztásához -STR_AI_LIST_AUTHOR :{BLACK}Készítő: {STRING} -STR_AI_LIST_VERSION :{BLACK}Verzió: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Készítő: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Verzió: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Elfogad STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}A kijelölt szkript kiválasztása diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index ece9ed059c..a4a7227e21 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -3298,9 +3298,9 @@ STR_AI_CONFIG_CONFIGURE_TOOLTIP :{BLACK}Stilltu # Available AIs window STR_AI_LIST_TOOLTIP :{BLACK}Smelltu til að merkja gervigreind -STR_AI_LIST_AUTHOR :{BLACK}Höfundur: {STRING} -STR_AI_LIST_VERSION :{BLACK}Útgáfa: {NUM} -STR_AI_LIST_URL :{BLACK}Vefslóð: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Höfundur: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Útgáfa: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}Vefslóð: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Í lagi STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Velja merkta gervigreind diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index 8879e281ff..5b4d1743c7 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -3526,9 +3526,9 @@ STR_AI_LIST_CAPTION_AI :AI STR_AI_LIST_CAPTION_GAMESCRIPT :SkripPermainan STR_AI_LIST_TOOLTIP :{BLACK}Klik untuk memilih skrip AI -STR_AI_LIST_AUTHOR :{BLACK}Pembuat: {STRING} -STR_AI_LIST_VERSION :{BLACK}Versi: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Pembuat: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Versi: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Terapkan STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Pilih skrip AI yg disorot diff --git a/src/lang/irish.txt b/src/lang/irish.txt index 8f95b8f00e..8bbdd1f2c9 100644 --- a/src/lang/irish.txt +++ b/src/lang/irish.txt @@ -3365,9 +3365,9 @@ STR_AI_CONFIG_CONFIGURE_TOOLTIP :{BLACK}Cumraigh # Available AIs window STR_AI_LIST_TOOLTIP :{BLACK}Cliceáil chun AI a roghnú -STR_AI_LIST_AUTHOR :{BLACK}Údar: {STRING} -STR_AI_LIST_VERSION :{BLACK}Leagan: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Údar: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Leagan: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Glac leis STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Roghnaigh an AI aibhsithe diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 386d5f37e2..75d5734d84 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -3580,9 +3580,9 @@ STR_AI_LIST_CAPTION_AI :IA STR_AI_LIST_CAPTION_GAMESCRIPT :Script STR_AI_LIST_TOOLTIP :{BLACK}Fare clic per selezionare uno script -STR_AI_LIST_AUTHOR :{BLACK}Autore: {STRING} -STR_AI_LIST_VERSION :{BLACK}Versione: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Autore: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Versione: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Accetta STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Sceglie lo script selezionato diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index 9cba022d4f..50ca4d2f51 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -3365,9 +3365,9 @@ STR_AI_CONFIG_CONFIGURE_TOOLTIP :{BLACK}AI の # Available AIs window STR_AI_LIST_TOOLTIP :{BLACK}クリックして AI を選択します。 -STR_AI_LIST_AUTHOR :{BLACK}作成者： {STRING} -STR_AI_LIST_VERSION :{BLACK}バージョン： {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}作成者： {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}バージョン： {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}OK STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}選択した AI を使用します。 diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 3d5d2205eb..ccb1755e9c 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -3553,9 +3553,9 @@ STR_AI_LIST_CAPTION_AI :{G=f}AI STR_AI_LIST_CAPTION_GAMESCRIPT :{G=f}게임 스크립트 STR_AI_LIST_TOOLTIP :{BLACK}클릭하여 AI를 선택하세요 -STR_AI_LIST_AUTHOR :{BLACK}저자: {STRING} -STR_AI_LIST_VERSION :{BLACK}버젼: {NUM} -STR_AI_LIST_URL :{BLACK}주소: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}저자: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}버젼: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}주소: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}적용 STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}선택한 AI 선택 diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index 81be1fba22..d935d3d4f6 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -3561,9 +3561,9 @@ STR_AI_LIST_CAPTION_AI :MI STR_AI_LIST_CAPTION_GAMESCRIPT :Spēles skripti STR_AI_LIST_TOOLTIP :{BLACK}Uzklikšķināt, lai izvēlētos skriptu -STR_AI_LIST_AUTHOR :{BLACK}Autors: {STRING} -STR_AI_LIST_VERSION :{BLACK}Versija: {NUM} -STR_AI_LIST_URL :{BLACK}Tīmekļa adrese: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Autors: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Versija: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}Tīmekļa adrese: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Apstiprināt STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Izvēlēties izcelto skriptu diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index ca1fe3bfe8..3e02492fb2 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -3803,9 +3803,9 @@ STR_AI_LIST_CAPTION_AI :DI'ai STR_AI_LIST_CAPTION_GAMESCRIPT :Žaidimo skriptai STR_AI_LIST_TOOLTIP :{BLACK}Pasirinkite skriptą paspausdami -STR_AI_LIST_AUTHOR :{BLACK}Autorius: {STRING} -STR_AI_LIST_VERSION :{BLACK}Versija: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Autorius: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Versija: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Priimti STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Pasirinkti pažymėtą skriptą diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index 96a549b58a..efef8807e5 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -3552,9 +3552,9 @@ STR_AI_LIST_CAPTION_AI :KIs STR_AI_LIST_CAPTION_GAMESCRIPT :Spill-Scripter STR_AI_LIST_TOOLTIP :{BLACK}Klickt fir en Script ze selectéieren -STR_AI_LIST_AUTHOR :{BLACK}Autor: {STRING} -STR_AI_LIST_VERSION :{BLACK}Versioun: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Autor: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Versioun: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Acceptéiert STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Selectéiert ungewielte Script diff --git a/src/lang/malay.txt b/src/lang/malay.txt index 6016b0b0f3..acf188b7ff 100644 --- a/src/lang/malay.txt +++ b/src/lang/malay.txt @@ -3550,9 +3550,9 @@ STR_AI_LIST_CAPTION_AI :AIs STR_AI_LIST_CAPTION_GAMESCRIPT :SkripPermainan STR_AI_LIST_TOOLTIP :{BLACK}Klik untuk pilih skrip -STR_AI_LIST_AUTHOR :{BLACK}Penulis: {STRING} -STR_AI_LIST_VERSION :{BLACK}Versi: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Penulis: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Versi: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Terima STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Pilih skrip yang diserlahkan diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index 7e6f4638c7..0efeff33d0 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -3554,9 +3554,9 @@ STR_AI_LIST_CAPTION_AI :AIer STR_AI_LIST_CAPTION_GAMESCRIPT :Spillskript STR_AI_LIST_TOOLTIP :{BLACK}Klikk for å velge et skript -STR_AI_LIST_AUTHOR :{BLACK}Forfatter: {STRING} -STR_AI_LIST_VERSION :{BLACK}Versjon: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Forfatter: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Versjon: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Godta STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Velg det merkede skript diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index 405000b153..194ac466dd 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -3554,9 +3554,9 @@ STR_AI_LIST_CAPTION_AI :AIar STR_AI_LIST_CAPTION_GAMESCRIPT :Spelscript STR_AI_LIST_TOOLTIP :{BLACK}Klikk for å velje ein AI -STR_AI_LIST_AUTHOR :{BLACK}Forfattar: {STRING} -STR_AI_LIST_VERSION :{BLACK}Versjon: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Forfattar: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Versjon: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Godta STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Merk utheva AI diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 42f81fc0e6..409f4bda02 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -3938,9 +3938,9 @@ STR_AI_LIST_CAPTION_AI :Gracze SI STR_AI_LIST_CAPTION_GAMESCRIPT :Game Script'y STR_AI_LIST_TOOLTIP :{BLACK}Kliknij, aby wybrać skrypt -STR_AI_LIST_AUTHOR :{BLACK}Autor: {STRING} -STR_AI_LIST_VERSION :{BLACK}Wersja: {NUM} -STR_AI_LIST_URL :{BLACK}Adres: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Autor: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Wersja: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}Adres: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Zaakceptuj STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Wybierz zaznaczony skrypt diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index bd5ec8c9f6..dbe917bf9b 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -3553,9 +3553,9 @@ STR_AI_LIST_CAPTION_AI :IAs STR_AI_LIST_CAPTION_GAMESCRIPT :Scripts de Jogo STR_AI_LIST_TOOLTIP :{BLACK}Clique para seleccionar um script -STR_AI_LIST_AUTHOR :{BLACK}Autor: {STRING} -STR_AI_LIST_VERSION :{BLACK}Versão: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Autor: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Versão: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Aceitar STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Seleccionar script marcado diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index 5168775268..f3215e2036 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -3552,9 +3552,9 @@ STR_AI_LIST_CAPTION_AI :IA STR_AI_LIST_CAPTION_GAMESCRIPT :Scripturi Joc STR_AI_LIST_TOOLTIP :{BLACK}Click pentru a alege un script -STR_AI_LIST_AUTHOR :{BLACK}Autor: {STRING} -STR_AI_LIST_VERSION :{BLACK}Versiune: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Autor: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Versiune: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Acceptă STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Alege scriptul marcat diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 619559e56c..06b4630a8b 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -3747,9 +3747,9 @@ STR_AI_LIST_CAPTION_AI :модули И STR_AI_LIST_CAPTION_GAMESCRIPT :игровые скрипты STR_AI_LIST_TOOLTIP :{BLACK}Щёлкните для выбора скрипта -STR_AI_LIST_AUTHOR :{BLACK}Автор: {STRING} -STR_AI_LIST_VERSION :{BLACK}Версия: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Автор: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Версия: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Выбрать STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Выбрать подсвеченный скрипт diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index 061122e7f3..00a26aac9d 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -3763,9 +3763,9 @@ STR_AI_LIST_CAPTION_AI :VIe STR_AI_LIST_CAPTION_GAMESCRIPT :Skripte Partije STR_AI_LIST_TOOLTIP :{BLACK}Klikom se označava skripta -STR_AI_LIST_AUTHOR :{BLACK}Autor: {STRING} -STR_AI_LIST_VERSION :{BLACK}Izdanje: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Autor: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Izdanje: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Prihvati STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Izabira označenu skriptu diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index 055e9e646c..a5418055ee 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -3548,9 +3548,9 @@ STR_AI_LIST_CAPTION_AI :AI STR_AI_LIST_CAPTION_GAMESCRIPT :游戏脚本 STR_AI_LIST_TOOLTIP :{BLACK}点击选择 AI -STR_AI_LIST_AUTHOR :{BLACK}作者: {STRING} -STR_AI_LIST_VERSION :{BLACK}版本: {NUM} -STR_AI_LIST_URL :{BLACK}URL： {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}作者: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}版本: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}接受 STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}选择高亮的 AI diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index c104570d09..5fa59804ce 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -3614,9 +3614,9 @@ STR_AI_LIST_CAPTION_AI :AIs STR_AI_LIST_CAPTION_GAMESCRIPT :Herné skripty STR_AI_LIST_TOOLTIP :{BLACK}Klikni pre výber skriptu -STR_AI_LIST_AUTHOR :{BLACK}Autor: {STRING} -STR_AI_LIST_VERSION :{BLACK}Verzia: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Autor: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Verzia: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Potvrdiť STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Vybrať vyznačený skript diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index ceb2913994..ed3bcccf67 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -3705,9 +3705,9 @@ STR_AI_LIST_CAPTION_AI :UI-ji STR_AI_LIST_CAPTION_GAMESCRIPT :Skripte igre STR_AI_LIST_TOOLTIP :{BLACK}Klikni za izbor skripte -STR_AI_LIST_AUTHOR :{BLACK}Avtor: {STRING} -STR_AI_LIST_VERSION :{BLACK}Verzija: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Avtor: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Verzija: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Potrdi STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Izberi označeno skripto diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 05e7ed7376..449b4ca209 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -3553,9 +3553,9 @@ STR_AI_LIST_CAPTION_AI :IAs STR_AI_LIST_CAPTION_GAMESCRIPT :Scripts de Juego STR_AI_LIST_TOOLTIP :{BLACK}Click para seleccionar un script -STR_AI_LIST_AUTHOR :{BLACK}Autor: {STRING} -STR_AI_LIST_VERSION :{BLACK}Versión: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Autor: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Versión: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Aceptar STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Seleccionar el script resaltado diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index bb65b25e45..d1889b5b11 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -3552,9 +3552,9 @@ STR_AI_LIST_CAPTION_AI :Datorspelare STR_AI_LIST_CAPTION_GAMESCRIPT :Spelskript STR_AI_LIST_TOOLTIP :{BLACK}Klicka för att välja en datorspelare -STR_AI_LIST_AUTHOR :{BLACK}Upphovsman: {STRING} -STR_AI_LIST_VERSION :{BLACK}Version: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Upphovsman: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Version: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Acceptera STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Välj markerad datorspelare diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index 8836e00eea..77e6652107 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -3407,9 +3407,9 @@ STR_AI_LIST_CAPTION_AI :AI STR_AI_LIST_CAPTION_GAMESCRIPT :遊戲腳本 STR_AI_LIST_TOOLTIP :{BLACK}點選以選擇腳本 -STR_AI_LIST_AUTHOR :{BLACK}作者： {STRING} -STR_AI_LIST_VERSION :{BLACK}版本： {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}作者： {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}版本： {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}接受 STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}選擇標示到的腳本 diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index fd9f482458..8abf988b1e 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -3553,9 +3553,9 @@ STR_AI_LIST_CAPTION_AI :YZ'ler STR_AI_LIST_CAPTION_GAMESCRIPT :OyunBetikleri STR_AI_LIST_TOOLTIP :{BLACK}YZ seçmek için bir tuşa basın -STR_AI_LIST_AUTHOR :{BLACK}Yazar: {STRING} -STR_AI_LIST_VERSION :{BLACK}Sürüm: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Yazar: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Sürüm: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Kabul et STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Vurgulanan YZ'yi seç diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index 2f561b9db8..e902e63124 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -3677,9 +3677,9 @@ STR_AI_LIST_CAPTION_AI :Модулі А STR_AI_LIST_CAPTION_GAMESCRIPT :Ігрові Скрипти STR_AI_LIST_TOOLTIP :{BLACK}Клікніть, щоб вибрати скрипт -STR_AI_LIST_AUTHOR :{BLACK}Автор: {STRING} -STR_AI_LIST_VERSION :{BLACK}Версія: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Автор: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Версія: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Прийняти STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Вибрати виділений скрипт diff --git a/src/lang/unfinished/chuvash.txt b/src/lang/unfinished/chuvash.txt index cfb5795a3f..aed2d6c3ad 100644 --- a/src/lang/unfinished/chuvash.txt +++ b/src/lang/unfinished/chuvash.txt @@ -1265,7 +1265,7 @@ STR_AI_CONFIG_CHANGE_NONE : # Available AIs window -STR_AI_LIST_VERSION :{BLACK}Верси: {NUM} +STR_AI_LIST_VERSION :{LTBLUE}Верси: {ORANGE}{NUM} # AI Parameters diff --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt index 6af2713ca4..59fc476170 100644 --- a/src/lang/unfinished/frisian.txt +++ b/src/lang/unfinished/frisian.txt @@ -2491,8 +2491,8 @@ STR_AI_CONFIG_CHANGE_AI :AI # Available AIs window STR_AI_LIST_CAPTION_AI :AIs -STR_AI_LIST_VERSION :{BLACK}Ferzje: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_VERSION :{LTBLUE}Ferzje: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Akseptearje STR_AI_LIST_CANCEL :{BLACK}Annulearje diff --git a/src/lang/unfinished/persian.txt b/src/lang/unfinished/persian.txt index a7c5184bd3..957f08acf9 100644 --- a/src/lang/unfinished/persian.txt +++ b/src/lang/unfinished/persian.txt @@ -3167,8 +3167,8 @@ STR_AI_LIST_CAPTION_AI :هوش های STR_AI_LIST_CAPTION_GAMESCRIPT :کدهای بازی STR_AI_LIST_TOOLTIP :{BLACK}برای انتخاب روی یک کد کلیک کنید -STR_AI_LIST_VERSION :{BLACK}ویرایش: {NUM} -STR_AI_LIST_URL :{BLACK}آدرس اینترنتی: {STRING} +STR_AI_LIST_VERSION :{LTBLUE}ویرایش: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}آدرس اینترنتی: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}قبول STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}انتخاب کد مشخص شده diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt index fa985f28e6..577cc912a2 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -3552,9 +3552,9 @@ STR_AI_LIST_CAPTION_AI :AIs STR_AI_LIST_CAPTION_GAMESCRIPT :Game Scripts STR_AI_LIST_TOOLTIP :{BLACK}Chọn một AI -STR_AI_LIST_AUTHOR :{BLACK}Tác giả: {STRING} -STR_AI_LIST_VERSION :{BLACK}Phiên bản: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Tác giả: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Phiên bản: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Chấp nhận STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Chấp nhận AI đã chọn diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index b7f7e145dc..8ca8d5d6b8 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -3552,9 +3552,9 @@ STR_AI_LIST_CAPTION_AI :AIau STR_AI_LIST_CAPTION_GAMESCRIPT :Sgriptiau Gêm STR_AI_LIST_TOOLTIP :{BLACK}Cliciwch i ddewis sgript -STR_AI_LIST_AUTHOR :{BLACK}Awdur: {STRING} -STR_AI_LIST_VERSION :{BLACK}Fersiwn: {NUM} -STR_AI_LIST_URL :{BLACK}URL: {STRING} +STR_AI_LIST_AUTHOR :{LTBLUE}Awdur: {ORANGE}{STRING} +STR_AI_LIST_VERSION :{LTBLUE}Fersiwn: {ORANGE}{NUM} +STR_AI_LIST_URL :{LTBLUE}URL: {ORANGE}{STRING} STR_AI_LIST_ACCEPT :{BLACK}Derbyn STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Dewis y sgript a amlygwyd diff --git a/src/newgrf.cpp b/src/newgrf.cpp index 0a07fc49ff..36dedcca07 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -2442,11 +2442,22 @@ static ChangeInfoResult GlobalVarChangeInfo(uint gvid, int numinfo, int prop, By break; } - case 0x09: // Cargo translation table - /* This is loaded during the reservation stage, so just skip it here. */ - /* Each entry is 4 bytes. */ - buf->Skip(4); + case 0x09: { // Cargo Translation Table; loading during both reservation and activation stage (in case it is selected depending on defined cargos) + if (i == 0) { + if (gvid != 0) { + grfmsg(1, "GlobalVarChangeInfo: Cargo translation table must start at zero"); + return CIR_INVALID_ID; + } + + free(_cur.grffile->cargo_list); + _cur.grffile->cargo_max = numinfo; + _cur.grffile->cargo_list = MallocT(numinfo); + } + + CargoLabel cl = buf->ReadDWord(); + _cur.grffile->cargo_list[i] = BSWAP32(cl); break; + } case 0x0A: { // Currency display names uint curidx = GetNewgrfCurrencyIdConverted(gvid + i); @@ -2560,11 +2571,22 @@ static ChangeInfoResult GlobalVarChangeInfo(uint gvid, int numinfo, int prop, By buf->Skip(8); break; - case 0x12: // Rail type translation table - /* This is loaded during the reservation stage, so just skip it here. */ - /* Each entry is 4 bytes. */ - buf->Skip(4); + case 0x12: { // Rail type translation table; loading during both reservation and activation stage (in case it is selected depending on defined railtypes) + if (i == 0) { + if (gvid != 0) { + grfmsg(1, "GlobalVarChangeInfo: Rail type translation table must start at zero"); + return CIR_INVALID_ID; + } + + free(_cur.grffile->railtype_list); + _cur.grffile->railtype_max = numinfo; + _cur.grffile->railtype_list = MallocT(numinfo); + } + + RailTypeLabel rtl = buf->ReadDWord(); + _cur.grffile->railtype_list[i] = BSWAP32(rtl); break; + } case 0x13: // Gender translation table case 0x14: // Case translation table diff --git a/src/newgrf_cargo.cpp b/src/newgrf_cargo.cpp index 85f203a331..f9da37e7bc 100644 --- a/src/newgrf_cargo.cpp +++ b/src/newgrf_cargo.cpp @@ -126,18 +126,3 @@ CargoID GetCargoTranslation(uint8 cargo, const GRFFile *grffile, bool usebit) } return CT_INVALID; } - -uint8 GetReverseCargoTranslation(CargoID cargo, const GRFFile *grffile) -{ - /* Note: All grf versions use CargoBit here. Pre-version 7 do NOT use the 'climate dependent' ID. */ - const CargoSpec *cs = CargoSpec::Get(cargo); - - /* If the GRF contains a translation table (and the cargo is in the table) - * then get the cargo ID for the label */ - for (uint i = 0; i < grffile->cargo_max; i++) { - if (cs->label == grffile->cargo_list[i]) return i; - } - - /* No matching label was found, so we return the 'climate independent' 'bitnum' */ - return cs->bitnum; -} diff --git a/src/newgrf_cargo.h b/src/newgrf_cargo.h index ddebeeb30a..51add1e7a9 100644 --- a/src/newgrf_cargo.h +++ b/src/newgrf_cargo.h @@ -27,6 +27,5 @@ struct GRFFile; SpriteID GetCustomCargoSprite(const CargoSpec *cs); uint16 GetCargoCallback(CallbackID callback, uint32 param1, uint32 param2, const CargoSpec *cs); CargoID GetCargoTranslation(uint8 cargo, const GRFFile *grffile, bool usebit = false); -uint8 GetReverseCargoTranslation(CargoID cargo, const GRFFile *grffile); #endif /* NEWGRF_CARGO_H */ diff --git a/src/newgrf_industries.cpp b/src/newgrf_industries.cpp index c0e4d65269..aeba91f7f7 100644 --- a/src/newgrf_industries.cpp +++ b/src/newgrf_industries.cpp @@ -657,7 +657,7 @@ bool IndustryTemporarilyRefusesCargo(Industry *ind, CargoID cargo_type) const IndustrySpec *indspec = GetIndustrySpec(ind->type); if (HasBit(indspec->callback_mask, CBM_IND_REFUSE_CARGO)) { uint16 res = GetIndustryCallback(CBID_INDUSTRY_REFUSE_CARGO, - 0, GetReverseCargoTranslation(cargo_type, indspec->grf_prop.grffile), + 0, indspec->grf_prop.grffile->cargo_map[cargo_type], ind, ind->type, ind->location.tile); if (res != CALLBACK_FAILED) return !ConvertBooleanCallback(indspec->grf_prop.grffile, CBID_INDUSTRY_REFUSE_CARGO, res); } diff --git a/src/newgrf_station.cpp b/src/newgrf_station.cpp index 90751cdcbe..047566ee4e 100644 --- a/src/newgrf_station.cpp +++ b/src/newgrf_station.cpp @@ -957,7 +957,7 @@ void TriggerStationAnimation(BaseStation *st, TileIndex tile, StationAnimationTr if (cargo_type == CT_INVALID) { cargo = CT_INVALID; } else { - cargo = GetReverseCargoTranslation(cargo_type, ss->grf_prop.grffile); + cargo = ss->grf_prop.grffile->cargo_map[cargo_type]; } StationAnimationBase::ChangeAnimationFrame(CBID_STATION_ANIM_START_STOP, ss, st, tile, (random_bits << 16) | Random(), (uint8)trigger | (cargo << 8)); } diff --git a/src/station_gui.cpp b/src/station_gui.cpp index e3610c2cce..80f33988fc 100644 --- a/src/station_gui.cpp +++ b/src/station_gui.cpp @@ -849,8 +849,6 @@ struct StationViewWindow : public Window { ~StationViewWindow() { Owner owner = Station::Get(this->window_number)->owner; - if (!Company::IsValidID(owner)) owner = _local_company; - if (!Company::IsValidID(owner)) return; // Spectators DeleteWindowById(WC_TRAINS_LIST, VehicleListIdentifier(VL_STATION_LIST, VEH_TRAIN, owner, this->window_number).Pack(), false); DeleteWindowById(WC_ROADVEH_LIST, VehicleListIdentifier(VL_STATION_LIST, VEH_ROAD, owner, this->window_number).Pack(), false); DeleteWindowById(WC_SHIPS_LIST, VehicleListIdentifier(VL_STATION_LIST, VEH_SHIP, owner, this->window_number).Pack(), false); @@ -1136,9 +1134,11 @@ struct StationViewWindow : public Window { case WID_SV_TRAINS: // Show list of scheduled trains to this station case WID_SV_ROADVEHS: // Show list of scheduled road-vehicles to this station case WID_SV_SHIPS: // Show list of scheduled ships to this station - case WID_SV_PLANES: // Show list of scheduled aircraft to this station - ShowVehicleListWindow(this->owner, (VehicleType)(widget - WID_SV_TRAINS), (StationID)this->window_number); + case WID_SV_PLANES: { // Show list of scheduled aircraft to this station + Owner owner = Station::Get(this->window_number)->owner; + ShowVehicleListWindow(owner, (VehicleType)(widget - WID_SV_TRAINS), (StationID)this->window_number); break; + } } } diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp index 81f85f534d..353d710b05 100644 --- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -1358,7 +1358,7 @@ public: } this->FinishInitNested(desc, window_number); - this->owner = this->vli.company; + if (this->vli.company != OWNER_NONE) this->owner = this->vli.company; if (this->vli.vtype == VEH_TRAIN) ResizeWindow(this, 65, 0); } @@ -1609,7 +1609,7 @@ static WindowDesc _vehicle_list_desc( static void ShowVehicleListWindowLocal(CompanyID company, VehicleListType vlt, VehicleType vehicle_type, uint16 unique_number) { - if (!Company::IsValidID(company)) return; + if (!Company::IsValidID(company) && company != OWNER_NONE) return; _vehicle_list_desc.cls = GetWindowClassForVehicleType(vehicle_type); AllocateWindowDescFront(&_vehicle_list_desc, VehicleListIdentifier(vlt, vehicle_type, company, unique_number).Pack()); @@ -1636,15 +1636,7 @@ void ShowVehicleListWindow(const Vehicle *v) void ShowVehicleListWindow(CompanyID company, VehicleType vehicle_type, StationID station) { - if (!Company::IsValidID(company)) { - company = _local_company; - /* This can happen when opening the vehicle list as a spectator. */ - if (!Company::IsValidID(company)) return; - _vehicle_list_desc.flags |= WDF_CONSTRUCTION; - } else { - _vehicle_list_desc.flags &= ~WDF_CONSTRUCTION; - } - + _vehicle_list_desc.flags &= ~WDF_CONSTRUCTION; ShowVehicleListWindowLocal(company, VL_STATION_LIST, vehicle_type, station); } diff --git a/src/vehiclelist.cpp b/src/vehiclelist.cpp index 4fc0f9ff3d..b099d7a84d 100644 --- a/src/vehiclelist.cpp +++ b/src/vehiclelist.cpp @@ -19,12 +19,13 @@ */ uint32 VehicleListIdentifier::Pack() { - assert(this->company < (1 << 4)); + byte c = this->company == OWNER_NONE ? 0xF : (byte)this->company; + assert(c < (1 << 4)); assert(this->type < (1 << 3)); assert(this->vtype < (1 << 2)); assert(this->index < (1 << 20)); - return this->company << 28 | this->type << 23 | this->vtype << 26 | this->index; + return c << 28 | this->type << 23 | this->vtype << 26 | this->index; } /** @@ -34,7 +35,8 @@ uint32 VehicleListIdentifier::Pack() */ bool VehicleListIdentifier::Unpack(uint32 data) { - this->company = (CompanyID)GB(data, 28, 4); + byte c = GB(data, 28, 4); + this->company = c == 0xF ? OWNER_NONE : (CompanyID)c; this->type = (VehicleListType)GB(data, 23, 3); this->vtype = (VehicleType)GB(data, 26, 2); this->index = GB(data, 0, 20);