mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r16061) [0.7] -Backport from trunk: 

- Fix: Non advanced vehicle list did not handle company switching correctly (r16054)
- Fix: Do not warn that crashed vehicles are getting old; upgrading them is impossible [FS#2740] (r16048)
- Fix: The currency abbreviation for the Romanian Leu is now RON [FS#774] (r16041)
- Fix: Dash was not able to run iconv detection (r16035)
- Fix: [NewGRF] Do not give "... Mines" as name to the station of oil rigs, or more general: do not add "... Mines" when the all of the cargoes are part of the liquid, passenger or mail classes [FS#2785] (r16029)
release/0.7
rubidium 2009-04-14 21:20:03 +00:00
parent 60901368cc
commit d9ed2d380f
50 changed files with 71 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.lib
View File

@ -2405,7 +2405,7 @@ int main() {
} }
EOF EOF
execute="$cxx_host $CFLAGS -c tmp.iconv.cpp -o tmp.iconv -DTESTING 2>&1" execute="$cxx_host $CFLAGS -c tmp.iconv.cpp -o tmp.iconv -DTESTING 2>&1"
eval $execute >&/dev/null eval $execute > /dev/null
ret=$? ret=$?
log 2 "executing $execute" log 2 "executing $execute"
log 2 " exit code $ret" log 2 " exit code $ret"
@ -2426,7 +2426,7 @@ int main() {
} }
EOF EOF
execute="$cxx_host $CFLAGS tmp.iconv.cpp -o tmp.iconv -DTESTING 2>&1" execute="$cxx_host $CFLAGS tmp.iconv.cpp -o tmp.iconv -DTESTING 2>&1"
eval $execute >&/dev/null eval $execute > /dev/null
ret=$? ret=$?
log 2 "executing $execute" log 2 "executing $execute"
log 2 " exit code $ret" log 2 " exit code $ret"

4
src/currency.cpp
View File

@ -35,7 +35,7 @@ static const CurrencySpec origin_currency_specs[NUM_CURRENCY] = {
{ 3, ',', 2002, "NLG ", "", 0, STR_CURR_NLG }, ///< dutch gulden { 3, ',', 2002, "NLG ", "", 0, STR_CURR_NLG }, ///< dutch gulden
{ 12, '.', CF_NOEURO, "", " Kr", 1, STR_CURR_NOK }, ///< norwegian krone { 12, '.', CF_NOEURO, "", " Kr", 1, STR_CURR_NOK }, ///< norwegian krone
{ 6, ' ', CF_NOEURO, "", " zl", 1, STR_CURR_PLN }, ///< polish zloty { 6, ' ', CF_NOEURO, "", " zl", 1, STR_CURR_PLN }, ///< polish zloty
{ 5, '.', CF_NOEURO, "", " Lei", 1, STR_CURR_ROL }, ///< romanian Lei { 5, '.', CF_NOEURO, "", " Lei", 1, STR_CURR_RON }, ///< romanian Lei
{ 50, ' ', CF_NOEURO, "", " p", 1, STR_CURR_RUR }, ///< russian rouble { 50, ' ', CF_NOEURO, "", " p", 1, STR_CURR_RUR }, ///< russian rouble
{ 352, '.', 2007, "", " SIT", 1, STR_CURR_SIT }, ///< slovenian tolar { 352, '.', 2007, "", " SIT", 1, STR_CURR_SIT }, ///< slovenian tolar
{ 13, '.', CF_NOEURO, "", " Kr", 1, STR_CURR_SEK }, ///< swedish krona { 13, '.', CF_NOEURO, "", " Kr", 1, STR_CURR_SEK }, ///< swedish krona
@ -76,7 +76,7 @@ enum {
CURR_NLG, CURR_NLG,
CURR_NOK, CURR_NOK,
CURR_PLN, CURR_PLN,
CURR_ROL, CURR_RON,
CURR_RUR, CURR_RUR,
CURR_SIT, CURR_SIT,
CURR_SEK, CURR_SEK,

2
src/lang/afrikaans.txt
View File

@ -807,7 +807,7 @@ STR_CURR_ITL :Italian Lira (I
STR_CURR_NLG :Dutch Guilder (NLG) STR_CURR_NLG :Dutch Guilder (NLG)
STR_CURR_NOK :Norwegian Krone (NOK) STR_CURR_NOK :Norwegian Krone (NOK)
STR_CURR_PLN :Polish Zloty (PLN) STR_CURR_PLN :Polish Zloty (PLN)
STR_CURR_ROL :Romanian Leu (ROL) STR_CURR_RON :Romanian Leu (RON)
STR_CURR_RUR :Russian Rubles (RUR) STR_CURR_RUR :Russian Rubles (RUR)
STR_CURR_SIT :Slovenian Tolar (SIT) STR_CURR_SIT :Slovenian Tolar (SIT)
STR_CURR_SEK :Swedish Krona (SEK) STR_CURR_SEK :Swedish Krona (SEK)

2
src/lang/arabic_egypt.txt
View File

@ -819,7 +819,7 @@ STR_CURR_ITL :ليرة ايط
STR_CURR_NLG :غلدر هولندي (NLG) STR_CURR_NLG :غلدر هولندي (NLG)
STR_CURR_NOK :كرونا نرويجية (NOK) STR_CURR_NOK :كرونا نرويجية (NOK)
STR_CURR_PLN :زلوتي بولندي (PLN) STR_CURR_PLN :زلوتي بولندي (PLN)
STR_CURR_ROL :لور يوناني (ROL) STR_CURR_RON :لور يوناني (RON)
STR_CURR_RUR :روبل روسي (RUR) STR_CURR_RUR :روبل روسي (RUR)
STR_CURR_SIT :تولار سوفاني (SIT) STR_CURR_SIT :تولار سوفاني (SIT)
STR_CURR_SEK :كرونا سويدية (SEK) STR_CURR_SEK :كرونا سويدية (SEK)

2
src/lang/brazilian_portuguese.txt
View File

@ -819,7 +819,7 @@ STR_CURR_ITL :Lira Italiana (
STR_CURR_NLG :Guilda Holandesa (NLG) STR_CURR_NLG :Guilda Holandesa (NLG)
STR_CURR_NOK :Coroa Norueguesa (NOK) STR_CURR_NOK :Coroa Norueguesa (NOK)
STR_CURR_PLN :Zloty Polaco (PLN) STR_CURR_PLN :Zloty Polaco (PLN)
STR_CURR_ROL :Lei Romeno (ROL) STR_CURR_RON :Lei Romeno (RON)
STR_CURR_RUR :Rublo Russo (RUR) STR_CURR_RUR :Rublo Russo (RUR)
STR_CURR_SIT :Tolar Eslovênio (SIT) STR_CURR_SIT :Tolar Eslovênio (SIT)
STR_CURR_SEK :Coroa Sueca (SEK) STR_CURR_SEK :Coroa Sueca (SEK)

2
src/lang/bulgarian.txt
View File

@ -818,7 +818,7 @@ STR_CURR_ITL :италиан
STR_CURR_NLG :холандски гулден (NLG) STR_CURR_NLG :холандски гулден (NLG)
STR_CURR_NOK :норвежка крона (NOK) STR_CURR_NOK :норвежка крона (NOK)
STR_CURR_PLN :полска злота (PLN) STR_CURR_PLN :полска злота (PLN)
STR_CURR_ROL :румънска лея (ROL) STR_CURR_RON :румънска лея (RON)
STR_CURR_RUR :руска рубла (RUR) STR_CURR_RUR :руска рубла (RUR)
STR_CURR_SIT :словенски толар (SIT) STR_CURR_SIT :словенски толар (SIT)
STR_CURR_SEK :шведска крона (SEK) STR_CURR_SEK :шведска крона (SEK)

2
src/lang/catalan.txt
View File

@ -818,7 +818,7 @@ STR_CURR_ITL :Lires Italianes
STR_CURR_NLG :Florins Holandesos (NLG) STR_CURR_NLG :Florins Holandesos (NLG)
STR_CURR_NOK :Corones Noruegues (NOK) STR_CURR_NOK :Corones Noruegues (NOK)
STR_CURR_PLN :Zloty Polonès (PLN) STR_CURR_PLN :Zloty Polonès (PLN)
STR_CURR_ROL :Leu Romanès (ROL) STR_CURR_RON :Leu Romanès (RON)
STR_CURR_RUR :Rubles Russos (RUR) STR_CURR_RUR :Rubles Russos (RUR)
STR_CURR_SIT :Tòlar Eslovè (SIT) STR_CURR_SIT :Tòlar Eslovè (SIT)
STR_CURR_SEK :Corones Sueques (SEK) STR_CURR_SEK :Corones Sueques (SEK)

2
src/lang/croatian.txt
View File

@ -883,7 +883,7 @@ STR_CURR_ITL :Talijanska lira
STR_CURR_NLG :Nizozemski gulden (NLG) STR_CURR_NLG :Nizozemski gulden (NLG)
STR_CURR_NOK :Norveška kruna (NOK) STR_CURR_NOK :Norveška kruna (NOK)
STR_CURR_PLN :Poljski zloti (PLN) STR_CURR_PLN :Poljski zloti (PLN)
STR_CURR_ROL :Rumunjski lev (ROL) STR_CURR_RON :Rumunjski lev (RON)
STR_CURR_RUR :Ruske rublje (RUR) STR_CURR_RUR :Ruske rublje (RUR)
STR_CURR_SIT :Slovenski tolar (SIT) STR_CURR_SIT :Slovenski tolar (SIT)
STR_CURR_SEK :Švedska kruna (SEK) STR_CURR_SEK :Švedska kruna (SEK)

2
src/lang/czech.txt
View File

@ -886,7 +886,7 @@ STR_CURR_ITL :Italská lira (
STR_CURR_NLG :Holandský gulden (NLG) STR_CURR_NLG :Holandský gulden (NLG)
STR_CURR_NOK :Norská koruna (NOK) STR_CURR_NOK :Norská koruna (NOK)
STR_CURR_PLN :Polský zlotý (PLN) STR_CURR_PLN :Polský zlotý (PLN)
STR_CURR_ROL :Rumunský lei (ROL) STR_CURR_RON :Rumunský lei (RON)
STR_CURR_RUR :Ruský rubl (RUR) STR_CURR_RUR :Ruský rubl (RUR)
STR_CURR_SIT :Slovinský tolar (SIT) STR_CURR_SIT :Slovinský tolar (SIT)
STR_CURR_SEK :Švédská koruna (SEK) STR_CURR_SEK :Švédská koruna (SEK)

2
src/lang/danish.txt
View File

@ -818,7 +818,7 @@ STR_CURR_ITL :Italienske Lire
STR_CURR_NLG :Hollandske Guilder (NLG) STR_CURR_NLG :Hollandske Guilder (NLG)
STR_CURR_NOK :Norske Kroner (NOK) STR_CURR_NOK :Norske Kroner (NOK)
STR_CURR_PLN :Polske Zloty (PLN) STR_CURR_PLN :Polske Zloty (PLN)
STR_CURR_ROL :Rumænske Lei (ROL) STR_CURR_RON :Rumænske Lei (RON)
STR_CURR_RUR :Russiske Rubel (RUR) STR_CURR_RUR :Russiske Rubel (RUR)
STR_CURR_SIT :Slovenske Tolare (SIT) STR_CURR_SIT :Slovenske Tolare (SIT)
STR_CURR_SEK :Svenske Kroner (SEK) STR_CURR_SEK :Svenske Kroner (SEK)

2
src/lang/dutch.txt
View File

@ -818,7 +818,7 @@ STR_CURR_ITL :Italiaanse Lier
STR_CURR_NLG :Nederlandse Gulden (NLG) STR_CURR_NLG :Nederlandse Gulden (NLG)
STR_CURR_NOK :Noorse Kronen (NOK) STR_CURR_NOK :Noorse Kronen (NOK)
STR_CURR_PLN :Poolse Zloty (PLN) STR_CURR_PLN :Poolse Zloty (PLN)
STR_CURR_ROL :Roemeense Leu (ROL) STR_CURR_RON :Roemeense Leu (RON)
STR_CURR_RUR :Russische Rubel (RUR) STR_CURR_RUR :Russische Rubel (RUR)
STR_CURR_SIT :Sloveense Tolar (SIT) STR_CURR_SIT :Sloveense Tolar (SIT)
STR_CURR_SEK :Zweedse Kronen (SEK) STR_CURR_SEK :Zweedse Kronen (SEK)

2
src/lang/english.txt
View File

@ -818,7 +818,7 @@ STR_CURR_ITL :Italian Lira (I
STR_CURR_NLG :Dutch Guilder (NLG) STR_CURR_NLG :Dutch Guilder (NLG)
STR_CURR_NOK :Norwegian Krone (NOK) STR_CURR_NOK :Norwegian Krone (NOK)
STR_CURR_PLN :Polish Zloty (PLN) STR_CURR_PLN :Polish Zloty (PLN)
STR_CURR_ROL :Romanian Leu (ROL) STR_CURR_RON :Romanian Leu (RON)
STR_CURR_RUR :Russian Rubles (RUR) STR_CURR_RUR :Russian Rubles (RUR)
STR_CURR_SIT :Slovenian Tolar (SIT) STR_CURR_SIT :Slovenian Tolar (SIT)
STR_CURR_SEK :Swedish Krona (SEK) STR_CURR_SEK :Swedish Krona (SEK)

2
src/lang/english_US.txt
View File

@ -818,7 +818,7 @@ STR_CURR_ITL :Italian Lira (I
STR_CURR_NLG :Dutch Guilder (NLG) STR_CURR_NLG :Dutch Guilder (NLG)
STR_CURR_NOK :Norwegian Krone (NOK) STR_CURR_NOK :Norwegian Krone (NOK)
STR_CURR_PLN :Polish Zloty (PLN) STR_CURR_PLN :Polish Zloty (PLN)
STR_CURR_ROL :Romanian Leu (ROL) STR_CURR_RON :Romanian Leu (RON)
STR_CURR_RUR :Russian Rubel (RUR) STR_CURR_RUR :Russian Rubel (RUR)
STR_CURR_SIT :Slovenian Tolar (SIT) STR_CURR_SIT :Slovenian Tolar (SIT)
STR_CURR_SEK :Swedish Krona (SEK) STR_CURR_SEK :Swedish Krona (SEK)

2
src/lang/esperanto.txt
View File

@ -793,7 +793,7 @@ STR_CURR_ITL :Italaj Liroj (I
STR_CURR_NLG :Nederlandaj Guldenoj (NLG) STR_CURR_NLG :Nederlandaj Guldenoj (NLG)
STR_CURR_NOK :Norvegaj Kronoj (NOK) STR_CURR_NOK :Norvegaj Kronoj (NOK)
STR_CURR_PLN :Polaj Zlotoj (PLN) STR_CURR_PLN :Polaj Zlotoj (PLN)
STR_CURR_ROL :Rumanaj Leŭoj (ROL) STR_CURR_RON :Rumanaj Leŭoj (RON)
STR_CURR_RUR :Rusaj Rubloj (RUR) STR_CURR_RUR :Rusaj Rubloj (RUR)
STR_CURR_SIT :Slovenaj Tolaroj (SIT) STR_CURR_SIT :Slovenaj Tolaroj (SIT)
STR_CURR_SEK :Svedaj Kronoj (SEK) STR_CURR_SEK :Svedaj Kronoj (SEK)

2
src/lang/estonian.txt
View File

@ -865,7 +865,7 @@ STR_CURR_ITL :Itaalia liir (I
STR_CURR_NLG :Hollandi kulden (NLG) STR_CURR_NLG :Hollandi kulden (NLG)
STR_CURR_NOK :Norra kroon (NOK) STR_CURR_NOK :Norra kroon (NOK)
STR_CURR_PLN :Poola Zlott (PLN) STR_CURR_PLN :Poola Zlott (PLN)
STR_CURR_ROL :Rumeenia Leu (ROL) STR_CURR_RON :Rumeenia Leu (RON)
STR_CURR_RUR :Vene rubla (RUR) STR_CURR_RUR :Vene rubla (RUR)
STR_CURR_SIT :Sloveenia Talaar (SIT) STR_CURR_SIT :Sloveenia Talaar (SIT)
STR_CURR_SEK :Rootsi kroon (SEK) STR_CURR_SEK :Rootsi kroon (SEK)

2
src/lang/finnish.txt
View File

@ -818,7 +818,7 @@ STR_CURR_ITL :Italian liira (
STR_CURR_NLG :Hollannin guildeni (NLG) STR_CURR_NLG :Hollannin guildeni (NLG)
STR_CURR_NOK :Norjan kruunu (NOK) STR_CURR_NOK :Norjan kruunu (NOK)
STR_CURR_PLN :Puolan zloty (PLN) STR_CURR_PLN :Puolan zloty (PLN)
STR_CURR_ROL :Romanian leu (ROL) STR_CURR_RON :Romanian leu (RON)
STR_CURR_RUR :Venjän rupla (RUR) STR_CURR_RUR :Venjän rupla (RUR)
STR_CURR_SIT :Slovenian tolari (SIT) STR_CURR_SIT :Slovenian tolari (SIT)
STR_CURR_SEK :Ruotsin kruunu (SEK) STR_CURR_SEK :Ruotsin kruunu (SEK)

2
src/lang/french.txt
View File

@ -819,7 +819,7 @@ STR_CURR_ITL :Lire Italienne
STR_CURR_NLG :Florint Hollandais (NLG) STR_CURR_NLG :Florint Hollandais (NLG)
STR_CURR_NOK :Courronne Norvégienne (NOK) STR_CURR_NOK :Courronne Norvégienne (NOK)
STR_CURR_PLN :Nouv. Zloty Polonais (PLN) STR_CURR_PLN :Nouv. Zloty Polonais (PLN)
STR_CURR_ROL :Leu Roumain (ROL) STR_CURR_RON :Leu Roumain (RON)
STR_CURR_RUR :Rouble Russe (RUR) STR_CURR_RUR :Rouble Russe (RUR)
STR_CURR_SIT :Tolar Slovénien (SIT) STR_CURR_SIT :Tolar Slovénien (SIT)
STR_CURR_SEK :Couronne Suédoise (SEK) STR_CURR_SEK :Couronne Suédoise (SEK)

2
src/lang/galician.txt
View File

@ -806,7 +806,7 @@ STR_CURR_ITL :Lira Italiana (
STR_CURR_NLG :Florín Holandés (NLG) STR_CURR_NLG :Florín Holandés (NLG)
STR_CURR_NOK :Corona Norueguesa (NOK) STR_CURR_NOK :Corona Norueguesa (NOK)
STR_CURR_PLN :Zloty Polaco (PLN) STR_CURR_PLN :Zloty Polaco (PLN)
STR_CURR_ROL :Leu Rumano (ROL) STR_CURR_RON :Leu Rumano (RON)
STR_CURR_RUR :Rublo Ruso (RUR) STR_CURR_RUR :Rublo Ruso (RUR)
STR_CURR_SIT :Tolar Esloveno (SIT) STR_CURR_SIT :Tolar Esloveno (SIT)
STR_CURR_SEK :Corona Sueca (SEK) STR_CURR_SEK :Corona Sueca (SEK)

2
src/lang/german.txt
View File

@ -819,7 +819,7 @@ STR_CURR_ITL :Italienische Li
STR_CURR_NLG :Niederländ. Gulden (NLG) STR_CURR_NLG :Niederländ. Gulden (NLG)
STR_CURR_NOK :Norwegische Kronen (NOK) STR_CURR_NOK :Norwegische Kronen (NOK)
STR_CURR_PLN :Polnische Zloty (PLN) STR_CURR_PLN :Polnische Zloty (PLN)
STR_CURR_ROL :Rumänische Lei (ROL) STR_CURR_RON :Rumänische Lei (RON)
STR_CURR_RUR :Russische Rubel (RUR) STR_CURR_RUR :Russische Rubel (RUR)
STR_CURR_SIT :Slovenische Taler (SIT) STR_CURR_SIT :Slovenische Taler (SIT)
STR_CURR_SEK :Schwedische Kronen (SEK) STR_CURR_SEK :Schwedische Kronen (SEK)

2
src/lang/hebrew.txt
View File

@ -813,7 +813,7 @@ STR_CURR_ITL :(ITL) לירה
STR_CURR_NLG :(NLG) גילדן הולנדי STR_CURR_NLG :(NLG) גילדן הולנדי
STR_CURR_NOK :(NOK) קרונה נורווגית STR_CURR_NOK :(NOK) קרונה נורווגית
STR_CURR_PLN :(PLN) זלוטי פולני STR_CURR_PLN :(PLN) זלוטי פולני
STR_CURR_ROL :(ROL) ליו רומני STR_CURR_RON :(RON) ליו רומני
STR_CURR_RUR :(RUR) רובל רוסי STR_CURR_RUR :(RUR) רובל רוסי
STR_CURR_SIT :(SIT) טולר סלובני STR_CURR_SIT :(SIT) טולר סלובני
STR_CURR_SEK :(SEK) קרונה שוודית STR_CURR_SEK :(SEK) קרונה שוודית

2
src/lang/hungarian.txt
View File

@ -852,7 +852,7 @@ STR_CURR_ITL :Olasz Líra (IT
STR_CURR_NLG :Holland Guilder (NLG) STR_CURR_NLG :Holland Guilder (NLG)
STR_CURR_NOK :Norvég Korona (NOK) STR_CURR_NOK :Norvég Korona (NOK)
STR_CURR_PLN :Legyel Zlotyi (PLN) STR_CURR_PLN :Legyel Zlotyi (PLN)
STR_CURR_ROL :Román Lej (ROL) STR_CURR_RON :Román Lej (RON)
STR_CURR_RUR :Orosz Rubel (RUR) STR_CURR_RUR :Orosz Rubel (RUR)
STR_CURR_SIT :Szlovén Tolár (SIT) STR_CURR_SIT :Szlovén Tolár (SIT)
STR_CURR_SEK :Svéd Korona (SEK) STR_CURR_SEK :Svéd Korona (SEK)

2
src/lang/icelandic.txt
View File

@ -819,7 +819,7 @@ STR_CURR_ITL :Ítölsk líra
STR_CURR_NLG :Hollensk gyllini (NLG) STR_CURR_NLG :Hollensk gyllini (NLG)
STR_CURR_NOK :Norsk króna (NOK) STR_CURR_NOK :Norsk króna (NOK)
STR_CURR_PLN :Pólsk zloty (PLN) STR_CURR_PLN :Pólsk zloty (PLN)
STR_CURR_ROL :Rúmensk leu (ROL) STR_CURR_RON :Rúmensk leu (RON)
STR_CURR_RUR :Rússnesk rúbla (RUR) STR_CURR_RUR :Rússnesk rúbla (RUR)
STR_CURR_SIT :Slóvensk tolar (SIT) STR_CURR_SIT :Slóvensk tolar (SIT)
STR_CURR_SEK :Sænsk króna (SEK) STR_CURR_SEK :Sænsk króna (SEK)

2
src/lang/indonesian.txt
View File

@ -818,7 +818,7 @@ STR_CURR_ITL :Lira Italian (I
STR_CURR_NLG :Dutch Guilder (NLG) STR_CURR_NLG :Dutch Guilder (NLG)
STR_CURR_NOK :Krone Norwegia (NOK) STR_CURR_NOK :Krone Norwegia (NOK)
STR_CURR_PLN :Zloty Polandia (PLN) STR_CURR_PLN :Zloty Polandia (PLN)
STR_CURR_ROL :Leu Romania (ROL) STR_CURR_RON :Leu Romania (RON)
STR_CURR_RUR :Rubles Rusia (RUR) STR_CURR_RUR :Rubles Rusia (RUR)
STR_CURR_SIT :Tolar Slovenia (SIT) STR_CURR_SIT :Tolar Slovenia (SIT)
STR_CURR_SEK :Krona Swedia (SEK) STR_CURR_SEK :Krona Swedia (SEK)

2
src/lang/italian.txt
View File

@ -820,7 +820,7 @@ STR_CURR_ITL :Lira Italiana (
STR_CURR_NLG :Fiorino Olandese (NLG) STR_CURR_NLG :Fiorino Olandese (NLG)
STR_CURR_NOK :Corona Norvegese (NOK) STR_CURR_NOK :Corona Norvegese (NOK)
STR_CURR_PLN :Zloty Polacco (PLN) STR_CURR_PLN :Zloty Polacco (PLN)
STR_CURR_ROL :Leu Rumeno (ROL) STR_CURR_RON :Leu Rumeno (RON)
STR_CURR_RUR :Rublo Russo (RUR) STR_CURR_RUR :Rublo Russo (RUR)
STR_CURR_SIT :Tolar Sloveno (SIT) STR_CURR_SIT :Tolar Sloveno (SIT)
STR_CURR_SEK :Corona Svedese (SEK) STR_CURR_SEK :Corona Svedese (SEK)

2
src/lang/japanese.txt
View File

@ -816,7 +816,7 @@ STR_CURR_ITL :イタリアリ
STR_CURR_NLG :オランダギルダー（NLG） STR_CURR_NLG :オランダギルダー（NLG）
STR_CURR_NOK :ノルウェイクローネ（NOK） STR_CURR_NOK :ノルウェイクローネ（NOK）
STR_CURR_PLN :ポーランドズロティ（PLN） STR_CURR_PLN :ポーランドズロティ（PLN）
STR_CURR_ROL :ルーマニアレイ（ROL） STR_CURR_RON :ルーマニアレイ（RON）
STR_CURR_RUR :ロシアルーブル（RUR） STR_CURR_RUR :ロシアルーブル（RUR）
STR_CURR_SIT :スロベニアトラール（SIT） STR_CURR_SIT :スロベニアトラール（SIT）
STR_CURR_SEK :スウェーデンクローナ（SEK） STR_CURR_SEK :スウェーデンクローナ（SEK）

2
src/lang/korean.txt
View File

@ -819,7 +819,7 @@ STR_CURR_ITL :이탈리아
STR_CURR_NLG :네덜란드 길더 (NLG) STR_CURR_NLG :네덜란드 길더 (NLG)
STR_CURR_NOK :노르웨이 크로네 (NOK) STR_CURR_NOK :노르웨이 크로네 (NOK)
STR_CURR_PLN :폴란드 즐로티 (PLN) STR_CURR_PLN :폴란드 즐로티 (PLN)
STR_CURR_ROL :루마니아 레우 (ROL) STR_CURR_RON :루마니아 레우 (RON)
STR_CURR_RUR :러시아 루블 (RUR) STR_CURR_RUR :러시아 루블 (RUR)
STR_CURR_SIT :슬로바키아 톨라 (SIT) STR_CURR_SIT :슬로바키아 톨라 (SIT)
STR_CURR_SEK :스웨덴 크로나 (SEK) STR_CURR_SEK :스웨덴 크로나 (SEK)

2
src/lang/latvian.txt
View File

@ -819,7 +819,7 @@ STR_CURR_ITL :Itālijas liras
STR_CURR_NLG :Nīderlandes guldeņi(NLG) STR_CURR_NLG :Nīderlandes guldeņi(NLG)
STR_CURR_NOK :Norvēģijas kronas (NOK) STR_CURR_NOK :Norvēģijas kronas (NOK)
STR_CURR_PLN :Polijas zloti (PLN) STR_CURR_PLN :Polijas zloti (PLN)
STR_CURR_ROL :Rumānijas lejas (ROL) STR_CURR_RON :Rumānijas lejas (RON)
STR_CURR_RUR :Krievijas rubļii (RUR) STR_CURR_RUR :Krievijas rubļii (RUR)
STR_CURR_SIT :Slovēnijas tolārs (SIT) STR_CURR_SIT :Slovēnijas tolārs (SIT)
STR_CURR_SEK :Zviedrijas kronas (SEK) STR_CURR_SEK :Zviedrijas kronas (SEK)

2
src/lang/lithuanian.txt
View File

@ -852,7 +852,7 @@ STR_CURR_ITL :Italu liros (IT
STR_CURR_NLG :Olandijos guldenai (NLG) STR_CURR_NLG :Olandijos guldenai (NLG)
STR_CURR_NOK :Norvegijos kronos (NOK) STR_CURR_NOK :Norvegijos kronos (NOK)
STR_CURR_PLN :Lenkijos zlotai (PLN) STR_CURR_PLN :Lenkijos zlotai (PLN)
STR_CURR_ROL :Rumunijos lejos (ROL) STR_CURR_RON :Rumunijos lejos (RON)
STR_CURR_RUR :Rusijos rubliai (RUR) STR_CURR_RUR :Rusijos rubliai (RUR)
STR_CURR_SIT :Slovėnijos tolarai (SIT) STR_CURR_SIT :Slovėnijos tolarai (SIT)
STR_CURR_SEK :Svedijos kronos (SEK) STR_CURR_SEK :Svedijos kronos (SEK)

2
src/lang/luxembourgish.txt
View File

@ -812,7 +812,7 @@ STR_CURR_ITL :Italienësch Li
STR_CURR_NLG :Holländësch Gulden (NLG) STR_CURR_NLG :Holländësch Gulden (NLG)
STR_CURR_NOK :Norwegesch Kroun (NOK) STR_CURR_NOK :Norwegesch Kroun (NOK)
STR_CURR_PLN :Polnësch Zloty (PLN) STR_CURR_PLN :Polnësch Zloty (PLN)
STR_CURR_ROL :Rumänësch Leu (ROL) STR_CURR_RON :Rumänësch Leu (RON)
STR_CURR_RUR :Russësch Rubl (RUR) STR_CURR_RUR :Russësch Rubl (RUR)
STR_CURR_SIT :Slowenëschen Tolar (SIT) STR_CURR_SIT :Slowenëschen Tolar (SIT)
STR_CURR_SEK :Schwédësch Kroun (SEK) STR_CURR_SEK :Schwédësch Kroun (SEK)

2
src/lang/norwegian_bokmal.txt
View File

@ -816,7 +816,7 @@ STR_CURR_ITL :Italiensk lire
STR_CURR_NLG :Hollandsk guilder (NLG) STR_CURR_NLG :Hollandsk guilder (NLG)
STR_CURR_NOK :Norsk krone (NOK) STR_CURR_NOK :Norsk krone (NOK)
STR_CURR_PLN :Polsk zloty (PLN) STR_CURR_PLN :Polsk zloty (PLN)
STR_CURR_ROL :Rumensk leu (ROL) STR_CURR_RON :Rumensk leu (RON)
STR_CURR_RUR :Russisk rubel (RUR) STR_CURR_RUR :Russisk rubel (RUR)
STR_CURR_SIT :Slovensk tolar (SIT) STR_CURR_SIT :Slovensk tolar (SIT)
STR_CURR_SEK :Svensk krone (SEK) STR_CURR_SEK :Svensk krone (SEK)

2
src/lang/norwegian_nynorsk.txt
View File

@ -819,7 +819,7 @@ STR_CURR_ITL :Italiensk lire
STR_CURR_NLG :Hollandsk gylden (NLG) STR_CURR_NLG :Hollandsk gylden (NLG)
STR_CURR_NOK :Norsk krone (NOK) STR_CURR_NOK :Norsk krone (NOK)
STR_CURR_PLN :Polsk zloty (PLN) STR_CURR_PLN :Polsk zloty (PLN)
STR_CURR_ROL :Rumensk lei (ROL) STR_CURR_RON :Rumensk lei (RON)
STR_CURR_RUR :Russisk rubel (RUR) STR_CURR_RUR :Russisk rubel (RUR)
STR_CURR_SIT :Slovensk tolar (SIT) STR_CURR_SIT :Slovensk tolar (SIT)
STR_CURR_SEK :Svensk krone (SEK) STR_CURR_SEK :Svensk krone (SEK)

2
src/lang/piglatin.txt
View File

@ -818,7 +818,7 @@ STR_CURR_ITL :Italianway Iral
STR_CURR_NLG :Utchday Uildergay (NLGay) STR_CURR_NLG :Utchday Uildergay (NLGay)
STR_CURR_NOK :Orwegiannay Onekray (OKNay) STR_CURR_NOK :Orwegiannay Onekray (OKNay)
STR_CURR_PLN :Olishpay Otyzlay (PLNay) STR_CURR_PLN :Olishpay Otyzlay (PLNay)
STR_CURR_ROL :Omanianray Eulay (OLRay) STR_CURR_RON :Omanianray Eulay (OLRay)
STR_CURR_RUR :Ussianray Ublesray (URRay) STR_CURR_RUR :Ussianray Ublesray (URRay)
STR_CURR_SIT :Ovenianslay Olartay (ITSay) STR_CURR_SIT :Ovenianslay Olartay (ITSay)
STR_CURR_SEK :Edishsway Onakray (EKSay) STR_CURR_SEK :Edishsway Onakray (EKSay)

2
src/lang/polish.txt
View File

@ -863,7 +863,7 @@ STR_CURR_ITL :Lira włoska (I
STR_CURR_NLG :Gulden holenderski (NLG) STR_CURR_NLG :Gulden holenderski (NLG)
STR_CURR_NOK :Korona norweska (NOK) STR_CURR_NOK :Korona norweska (NOK)
STR_CURR_PLN :Złoty polski (PLN) STR_CURR_PLN :Złoty polski (PLN)
STR_CURR_ROL :Lej rumuński (ROL) STR_CURR_RON :Lej rumuński (RON)
STR_CURR_RUR :Rubel rosyjski (RUR) STR_CURR_RUR :Rubel rosyjski (RUR)
STR_CURR_SIT :Tolar słowenski (SIT) STR_CURR_SIT :Tolar słowenski (SIT)
STR_CURR_SEK :Korona szwedzka (SEK) STR_CURR_SEK :Korona szwedzka (SEK)

2
src/lang/portuguese.txt
View File

@ -818,7 +818,7 @@ STR_CURR_ITL :Lira Italiana (
STR_CURR_NLG :Guilda Holandesa (NLG) STR_CURR_NLG :Guilda Holandesa (NLG)
STR_CURR_NOK :Coroa Norueguesa (NOK) STR_CURR_NOK :Coroa Norueguesa (NOK)
STR_CURR_PLN :Zloty Polaco (PLN) STR_CURR_PLN :Zloty Polaco (PLN)
STR_CURR_ROL :Lei Romeno (ROL) STR_CURR_RON :Lei Romeno (RON)
STR_CURR_RUR :Rublo Russo (RUR) STR_CURR_RUR :Rublo Russo (RUR)
STR_CURR_SIT :Tolar Esloveno (SIT) STR_CURR_SIT :Tolar Esloveno (SIT)
STR_CURR_SEK :Coroa Sueca (SEK) STR_CURR_SEK :Coroa Sueca (SEK)

2
src/lang/romanian.txt
View File

@ -818,7 +818,7 @@ STR_CURR_ITL :Liră italiană
STR_CURR_NLG :Gulden olandez (NLG) STR_CURR_NLG :Gulden olandez (NLG)
STR_CURR_NOK :Coroană norvegiană (NOK) STR_CURR_NOK :Coroană norvegiană (NOK)
STR_CURR_PLN :Zlot polonez (PLN) STR_CURR_PLN :Zlot polonez (PLN)
STR_CURR_ROL :Leu românesc (ROL) STR_CURR_RON :Leu românesc (RON)
STR_CURR_RUR :Rublă rusească (RUR) STR_CURR_RUR :Rublă rusească (RUR)
STR_CURR_SIT :Tolar Sloven (SIT) STR_CURR_SIT :Tolar Sloven (SIT)
STR_CURR_SEK :Coroană suedeză (SEK) STR_CURR_SEK :Coroană suedeză (SEK)

2
src/lang/russian.txt
View File

@ -820,7 +820,7 @@ STR_CURR_ITL :Итальян
STR_CURR_NLG :Нидерландский гульден (NLG) STR_CURR_NLG :Нидерландский гульден (NLG)
STR_CURR_NOK :Норвежская крона (NOK) STR_CURR_NOK :Норвежская крона (NOK)
STR_CURR_PLN :Польский злотый (PLN) STR_CURR_PLN :Польский злотый (PLN)
STR_CURR_ROL :Римский лей (ROL) STR_CURR_RON :Римский лей (RON)
STR_CURR_RUR :Российский рубль (RUR) STR_CURR_RUR :Российский рубль (RUR)
STR_CURR_SIT :Словенский толар (SIT) STR_CURR_SIT :Словенский толар (SIT)
STR_CURR_SEK :Шведская крона (SEK) STR_CURR_SEK :Шведская крона (SEK)

2
src/lang/simplified_chinese.txt
View File

@ -818,7 +818,7 @@ STR_CURR_ITL :意大利里拉
STR_CURR_NLG :荷兰盾 (NLG) STR_CURR_NLG :荷兰盾 (NLG)
STR_CURR_NOK :挪威克郎 (NOK) STR_CURR_NOK :挪威克郎 (NOK)
STR_CURR_PLN :波兰兹罗提 (PLN) STR_CURR_PLN :波兰兹罗提 (PLN)
STR_CURR_ROL :罗马尼亚列伊 (ROL) STR_CURR_RON :罗马尼亚列伊 (RON)
STR_CURR_RUR :卢布 (RUR) STR_CURR_RUR :卢布 (RUR)
STR_CURR_SIT :斯洛文尼亚托拉尔 (SIT) STR_CURR_SIT :斯洛文尼亚托拉尔 (SIT)
STR_CURR_SEK :瑞典克郎 (SEK) STR_CURR_SEK :瑞典克郎 (SEK)

2
src/lang/slovak.txt
View File

@ -885,7 +885,7 @@ STR_CURR_ITL :Talianske Liry
STR_CURR_NLG :Danske Guldeny (NLG) STR_CURR_NLG :Danske Guldeny (NLG)
STR_CURR_NOK :Norske Koruny (NOK) STR_CURR_NOK :Norske Koruny (NOK)
STR_CURR_PLN :Polske Zloty (PLN) STR_CURR_PLN :Polske Zloty (PLN)
STR_CURR_ROL :Rumunske Lei (ROL) STR_CURR_RON :Rumunske Lei (RON)
STR_CURR_RUR :Ruske Ruble (RUR) STR_CURR_RUR :Ruske Ruble (RUR)
STR_CURR_SIT :Slovinske Toliare (SIT) STR_CURR_SIT :Slovinske Toliare (SIT)
STR_CURR_SEK :Svedske Koruny (SEK) STR_CURR_SEK :Svedske Koruny (SEK)

2
src/lang/slovenian.txt
View File

@ -860,7 +860,7 @@ STR_CURR_ITL :Italijanska Lir
STR_CURR_NLG :Nizozemski Gulden (NLG) STR_CURR_NLG :Nizozemski Gulden (NLG)
STR_CURR_NOK :Norveška Krona (NOK) STR_CURR_NOK :Norveška Krona (NOK)
STR_CURR_PLN :Poljski Zlot (PLN) STR_CURR_PLN :Poljski Zlot (PLN)
STR_CURR_ROL :Romunski Lej (ROL) STR_CURR_RON :Romunski Lej (RON)
STR_CURR_RUR :Ruski Rubelj (RUR) STR_CURR_RUR :Ruski Rubelj (RUR)
STR_CURR_SIT :Slovenski tolar (SIT) STR_CURR_SIT :Slovenski tolar (SIT)
STR_CURR_SEK :Švedska Krona (SEK) STR_CURR_SEK :Švedska Krona (SEK)

2
src/lang/spanish.txt
View File

@ -819,7 +819,7 @@ STR_CURR_ITL :Lira Italiana (
STR_CURR_NLG :Florín Holandés (NLG) STR_CURR_NLG :Florín Holandés (NLG)
STR_CURR_NOK :Corona Noruega(NOK) STR_CURR_NOK :Corona Noruega(NOK)
STR_CURR_PLN :Zloty Polaco (PLN) STR_CURR_PLN :Zloty Polaco (PLN)
STR_CURR_ROL :Leu Rumano (ROL) STR_CURR_RON :Leu Rumano (RON)
STR_CURR_RUR :Rublo Ruso (RUR) STR_CURR_RUR :Rublo Ruso (RUR)
STR_CURR_SIT :Tolar Eslovenio (SIT) STR_CURR_SIT :Tolar Eslovenio (SIT)
STR_CURR_SEK :Corona Sueca (SEK) STR_CURR_SEK :Corona Sueca (SEK)

2
src/lang/swedish.txt
View File

@ -818,7 +818,7 @@ STR_CURR_ITL :Italienska lire
STR_CURR_NLG :Holländska guilder (NLG) STR_CURR_NLG :Holländska guilder (NLG)
STR_CURR_NOK :Norska kronor (NOK) STR_CURR_NOK :Norska kronor (NOK)
STR_CURR_PLN :Polska Zloty (PLN) STR_CURR_PLN :Polska Zloty (PLN)
STR_CURR_ROL :Rumänsk Leu (ROL) STR_CURR_RON :Rumänsk Leu (RON)
STR_CURR_RUR :Ryska rubel (RUR) STR_CURR_RUR :Ryska rubel (RUR)
STR_CURR_SIT :Slovenska Tolar (SIT) STR_CURR_SIT :Slovenska Tolar (SIT)
STR_CURR_SEK :Svenska kronor (SEK) STR_CURR_SEK :Svenska kronor (SEK)

2
src/lang/traditional_chinese.txt
View File

@ -816,7 +816,7 @@ STR_CURR_ITL :義大利里拉
STR_CURR_NLG :荷蘭盾 (NLG) STR_CURR_NLG :荷蘭盾 (NLG)
STR_CURR_NOK :挪威克朗 (NOK) STR_CURR_NOK :挪威克朗 (NOK)
STR_CURR_PLN :波蘭茲羅提 (PLN) STR_CURR_PLN :波蘭茲羅提 (PLN)
STR_CURR_ROL :羅馬尼亞列伊 (ROL) STR_CURR_RON :羅馬尼亞列伊 (RON)
STR_CURR_RUR :俄羅斯盧布 (RUR) STR_CURR_RUR :俄羅斯盧布 (RUR)
STR_CURR_SIT :斯洛文尼亞托拉 (SIT) STR_CURR_SIT :斯洛文尼亞托拉 (SIT)
STR_CURR_SEK :瑞典克朗 (SEK) STR_CURR_SEK :瑞典克朗 (SEK)

2
src/lang/turkish.txt
View File

@ -818,7 +818,7 @@ STR_CURR_ITL :İtalyan Lirasi
STR_CURR_NLG :Hollanda Guilder (NLG) STR_CURR_NLG :Hollanda Guilder (NLG)
STR_CURR_NOK :Norweç Krone (NOK) STR_CURR_NOK :Norweç Krone (NOK)
STR_CURR_PLN :Polon Zilotu (PLN) STR_CURR_PLN :Polon Zilotu (PLN)
STR_CURR_ROL :Romanya Leusu (ROL) STR_CURR_RON :Romanya Leusu (RON)
STR_CURR_RUR :Rus Rublesi (RUR) STR_CURR_RUR :Rus Rublesi (RUR)
STR_CURR_SIT :Slovenya Toları (SIT) STR_CURR_SIT :Slovenya Toları (SIT)
STR_CURR_SEK :İsveç Kronasi (SEK) STR_CURR_SEK :İsveç Kronasi (SEK)

2
src/lang/ukrainian.txt
View File

@ -943,7 +943,7 @@ STR_CURR_ITL :Італійс
STR_CURR_NLG :Голландський гульден (NLG) STR_CURR_NLG :Голландський гульден (NLG)
STR_CURR_NOK :Норвезька крона (NOK) STR_CURR_NOK :Норвезька крона (NOK)
STR_CURR_PLN :Польський злотий (PLN) STR_CURR_PLN :Польський злотий (PLN)
STR_CURR_ROL :Румунський лей (ROL) STR_CURR_RON :Румунський лей (RON)
STR_CURR_RUR :Російський рубель (RUR) STR_CURR_RUR :Російський рубель (RUR)
STR_CURR_SIT :Словенський талер (SIT) STR_CURR_SIT :Словенський талер (SIT)
STR_CURR_SEK :Шведська крона (SEK) STR_CURR_SEK :Шведська крона (SEK)

2
src/lang/unfinished/greek.txt
View File

@ -819,7 +819,7 @@ STR_CURR_ITL :Ιταλική
STR_CURR_NLG :Ολλανδικό Φιορίνι (NLG) STR_CURR_NLG :Ολλανδικό Φιορίνι (NLG)
STR_CURR_NOK :Νορβηγική Κορώνα (NOK) STR_CURR_NOK :Νορβηγική Κορώνα (NOK)
STR_CURR_PLN :Πολωνικό Zloty (PLN) STR_CURR_PLN :Πολωνικό Zloty (PLN)
STR_CURR_ROL :Ρουμάνικο Λευ (ROL) STR_CURR_RON :Ρουμάνικο Λευ (RON)
STR_CURR_RUR :Ρώσσικες Ρούβλες (RUR) STR_CURR_RUR :Ρώσσικες Ρούβλες (RUR)
STR_CURR_SIT :Σλοβένικο Tolar (SIT) STR_CURR_SIT :Σλοβένικο Tolar (SIT)
STR_CURR_SEK :Σουηδική Κορώνα (SEK) STR_CURR_SEK :Σουηδική Κορώνα (SEK)

2
src/lang/welsh.txt
View File

@ -818,7 +818,7 @@ STR_CURR_ITL :Lira Eidalaidd
STR_CURR_NLG :Guilder (NLG) STR_CURR_NLG :Guilder (NLG)
STR_CURR_NOK :Krone Norwyaidd (NOK) STR_CURR_NOK :Krone Norwyaidd (NOK)
STR_CURR_PLN :Zloty Pwylaidd (PLN) STR_CURR_PLN :Zloty Pwylaidd (PLN)
STR_CURR_ROL :Leu Rwmanaidd (ROL) STR_CURR_RON :Leu Rwmanaidd (RON)
STR_CURR_RUR :Rwbl Rwsaidd (RUR) STR_CURR_RUR :Rwbl Rwsaidd (RUR)
STR_CURR_SIT :Tolar Slofenaidd (SIT) STR_CURR_SIT :Tolar Slofenaidd (SIT)
STR_CURR_SEK :Krona Swedaidd (SEK) STR_CURR_SEK :Krona Swedaidd (SEK)

2
src/settings.cpp
View File

@ -1264,7 +1264,7 @@ uint16 _old_diff_custom[GAME_DIFFICULTY_NUM];
/* Most of these strings are used both for gameopt-backward compatability /* Most of these strings are used both for gameopt-backward compatability
* and the settings tables. The rest is here for consistency. */ * and the settings tables. The rest is here for consistency. */
static const char *_locale_currencies = "GBP|USD|EUR|YEN|ATS|BEF|CHF|CZK|DEM|DKK|ESP|FIM|FRF|GRD|HUF|ISK|ITL|NLG|NOK|PLN|ROL|RUR|SIT|SEK|YTL|SKK|BRL|EEK|custom"; static const char *_locale_currencies = "GBP|USD|EUR|YEN|ATS|BEF|CHF|CZK|DEM|DKK|ESP|FIM|FRF|GRD|HUF|ISK|ITL|NLG|NOK|PLN|RON|RUR|SIT|SEK|YTL|SKK|BRL|EEK|custom";
static const char *_locale_units = "imperial|metric|si"; static const char *_locale_units = "imperial|metric|si";
static const char *_town_names = "english|french|german|american|latin|silly|swedish|dutch|finnish|polish|slovakish|norwegian|hungarian|austrian|romanian|czech|swiss|danish|turkish|italian|catalan"; static const char *_town_names = "english|french|german|american|latin|silly|swedish|dutch|finnish|polish|slovakish|norwegian|hungarian|austrian|romanian|czech|swiss|danish|turkish|italian|catalan";
static const char *_climates = "temperate|arctic|tropic|toyland"; static const char *_climates = "temperate|arctic|tropic|toyland";

8
src/station_cmd.cpp
View File

@ -148,8 +148,12 @@ static bool CMSAMine(TileIndex tile)
if ((GetIndustrySpec(ind->type)->life_type & INDUSTRYLIFE_EXTRACTIVE) == 0) return false; if ((GetIndustrySpec(ind->type)->life_type & INDUSTRYLIFE_EXTRACTIVE) == 0) return false;
for (uint i = 0; i < lengthof(ind->produced_cargo); i++) { for (uint i = 0; i < lengthof(ind->produced_cargo); i++) {
/* The industry extracts something non-liquid, i.e. no oil or plastic, so it is a mine */ /* The industry extracts something non-liquid, i.e. no oil or plastic, so it is a mine.
if (ind->produced_cargo[i] != CT_INVALID && (GetCargo(ind->produced_cargo[i])->classes & CC_LIQUID) == 0) return true; * Also the production of passengers and mail is ignored. */
if (ind->produced_cargo[i] != CT_INVALID &&
(GetCargo(ind->produced_cargo[i])->classes & (CC_LIQUID | CC_PASSENGERS | CC_MAIL)) == 0) {
return true;
}
} }
return false; return false;

4
src/vehicle.cpp
View File

@ -921,8 +921,8 @@ void AgeVehicle(Vehicle *v)
InvalidateWindow(WC_VEHICLE_DETAILS, v->index); InvalidateWindow(WC_VEHICLE_DETAILS, v->index);
/* Don't warn about non-primary or not ours vehicles */ /* Don't warn about non-primary or not ours vehicles or vehicles that are crashed */
if (v->Previous() != NULL || v->owner != _local_company) return; if (v->Previous() != NULL || v->owner != _local_company || (v->vehstatus & VS_CRASHED) != 0) return;
/* Don't warn if a renew is active */ /* Don't warn if a renew is active */
if (GetCompany(v->owner)->engine_renew && GetEngine(v->engine_type)->company_avail != 0) return; if (GetCompany(v->owner)->engine_renew && GetEngine(v->engine_type)->company_avail != 0) return;

28
src/vehicle_gui.cpp
View File

@ -815,21 +815,6 @@ struct VehicleListWindow : public BaseVehicleListWindow {
this->vehicle_type = (VehicleType)GB(this->window_number, 11, 5); this->vehicle_type = (VehicleType)GB(this->window_number, 11, 5);
this->owner = company; this->owner = company;
/* Hide the widgets that we will not use in this window
* Some windows contains actions only fit for the owner */
if (company == _local_company) {
this->HideWidget(VLW_WIDGET_OTHER_COMPANY_FILLER);
this->SetWidgetDisabledState(VLW_WIDGET_AVAILABLE_VEHICLES, window_type != VLW_STANDARD);
} else {
this->SetWidgetsHiddenState(true,
VLW_WIDGET_AVAILABLE_VEHICLES,
VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN,
VLW_WIDGET_STOP_ALL,
VLW_WIDGET_START_ALL,
VLW_WIDGET_EMPTY_BOTTOM_RIGHT,
WIDGET_LIST_END);
}
/* Set up the window widgets */ /* Set up the window widgets */
switch (this->vehicle_type) { switch (this->vehicle_type) {
case VEH_TRAIN: case VEH_TRAIN:
@ -996,11 +981,24 @@ struct VehicleListWindow : public BaseVehicleListWindow {
default: NOT_REACHED(); break; default: NOT_REACHED(); break;
} }
/* Hide the widgets that we will not use in this window
* Some windows contains actions only fit for the owner */
this->SetWidgetsHiddenState(this->owner != _local_company,
VLW_WIDGET_AVAILABLE_VEHICLES,
VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN,
VLW_WIDGET_STOP_ALL,
VLW_WIDGET_START_ALL,
VLW_WIDGET_EMPTY_BOTTOM_RIGHT,
WIDGET_LIST_END);
this->SetWidgetHiddenState(VLW_WIDGET_OTHER_COMPANY_FILLER, this->owner == _local_company);
if (this->owner == _local_company) {
this->SetWidgetDisabledState(VLW_WIDGET_AVAILABLE_VEHICLES, window_type != VLW_STANDARD);
this->SetWidgetsDisabledState(this->vehicles.Length() == 0, this->SetWidgetsDisabledState(this->vehicles.Length() == 0,
VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN, VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN,
VLW_WIDGET_STOP_ALL, VLW_WIDGET_STOP_ALL,
VLW_WIDGET_START_ALL, VLW_WIDGET_START_ALL,
WIDGET_LIST_END); WIDGET_LIST_END);
}
this->DrawWidgets(); this->DrawWidgets();