dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	config.lib
#	src/linkgraph/demands.cpp
#	src/linkgraph/mcf.cpp
#	src/linkgraph/refresh.cpp
#	src/linkgraph/refresh.h
#	src/smallmap_gui.cpp
This commit is contained in:
Jonathan G Rennison
2016-07-24 10:16:55 +01:00
parent e29da8323c a2a69c1480
commit 7b56097f50
17 changed files with 144 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bin/baseset/no_sound.obs
View File

@@ -40,6 +40,7 @@ description.ko_KR = 아무런 효과음도 없는 효과음 팩입니다.
description.la_VA = Sarcina sonorum sine ullis sonis.
description.lb_LU = E Soundpack ouni iergendee Sound.
description.lt_LT = Garsų pakas be jokių garsų.
description.lv_LV = Skaņu kopa bez skaņas.
description.nb_NO = En lydpakke uten noen lyder.
description.nl_NL = Een geluidset zonder geluid.
description.nn_NO = Ei lydpakke utan nokon lydar.

1
bin/baseset/orig_dos.obg
View File

@@ -40,6 +40,7 @@ description.ko_KR = 오리지널 트랜스포트 타이쿤 디럭스 도스 에
description.la_VA = Graphica ex editione originale Transport Tycoon Deluxe DOS.
description.lb_LU = Original Transport Tycoon Deluxe DOS Editioun Grafik.
description.lt_LT = Originali Transport Tycoon Deluxe DOS leidimo grafika.
description.lv_LV = Oriģinālā Transport Tycoon Deluxe DOS izdevuma grafika.
description.ms_MY = Grafik asal Transport Tycoon Deluxe DOS edition.
description.nb_NO = Original grafikk fra Transport Tycoon Deluxe for DOS.
description.nl_NL = Originele graphics van de Transport Tycoon Deluxe DOS-versie.

1
bin/baseset/orig_dos_de.obg
View File

@@ -40,6 +40,7 @@ description.ko_KR = 오리지널 트랜스포트 타이쿤 디럭스 도스 에
description.la_VA = Graphica ex editione originale Transport Tycoon Deluxe DOS (Germanica).
description.lb_LU = Original Transport Tycoon Deluxe DOS (Däitsch) Editioun Grafik.
description.lt_LT = Originali Transport Tycoon Deluxe DOS (Vokiečių) leidimo grafika.
description.lv_LV = Oriģinālā Transport Tycoon Deluxe DOS (vācu) izdevuma grafika.
description.nb_NO = Original grafikk fra Transport Tycoon Deluxe for DOS (tysk).
description.nl_NL = Originele graphics van de Duitse Transport Tycoon Deluxe DOS-versie.
description.nn_NO = Original grafikk frå Transport Tycoon Deluxe for DOS (tysk).

1
bin/baseset/orig_win.obg
View File

@@ -40,6 +40,7 @@ description.ko_KR = 오리지널 트랜스포트 타이쿤 디럭스 윈도 에
description.la_VA = Graphica ex editione originale Transport Tycoon Deluxe Windows.
description.lb_LU = Original Transport Tycoon Deluxe Windows Editioun Grafik.
description.lt_LT = Originali Transport Tycoon Deluxe Windows leidimo grafika.
description.lv_LV = Oriģinālā Transport Tycoon Deluxe Windows izdevuma grafika.
description.ms_MY = Grafik asal Transport Tycoon Deluxe edisi Windows.
description.nb_NO = Original grafikk fra Transport Tycoon Deluxe for Windows.
description.nl_NL = Originele graphics van de Transport Tycoon Deluxe Windows-versie.

44
config.lib
View File

@@ -1356,9 +1356,11 @@ make_compiler_cflags() {
ldflags="$ldflags -rdynamic"
else
# Enable some things only for certain GCC versions
cc_version=`$1 -dumpversion | cut -c 1,3`
# cc_version = major_version * 100 + minor_version
# For example: "3.3" -> 303, "4.9.2" -> 409, "6" -> 600, "23.5" -> 2305
cc_version=`$1 -dumpversion | $awk -F . '{printf "%d%02d", $1, $2}'`
if [ $cc_version -lt 33 ]; then
if [ $cc_version -lt 303 ]; then
log 1 "configure: error: gcc older than 3.3 can't compile OpenTTD because of its poor template support"
exit 1
fi
@@ -1371,20 +1373,20 @@ make_compiler_cflags() {
if [ $enable_assert -eq 0 ]; then
# Do not warn about unused variables when building without asserts
flags="$flags -Wno-unused-variable"
if [ $cc_version -ge 46 ]; then
if [ $cc_version -ge 406 ]; then
# GCC 4.6 gives more warnings, disable them too
flags="$flags -Wno-unused-but-set-variable"
flags="$flags -Wno-unused-but-set-parameter"
fi
fi
if [ $cc_version -ge 34 ]; then
if [ $cc_version -ge 304 ]; then
# Warn when a variable is used to initialise itself:
# int a = a;
flags="$flags -Winit-self"
fi
if [ $cc_version -ge 40 ]; then
if [ $cc_version -ge 400 ]; then
# GCC 4.0+ complains about that we break strict-aliasing.
# On most places we don't see how to fix it, and it doesn't
# break anything. So disable strict-aliasing to make the
@@ -1395,7 +1397,7 @@ make_compiler_cflags() {
flags="$flags -Wcast-qual"
fi
if [ $cc_version -ge 42 ]; then
if [ $cc_version -ge 402 ]; then
# GCC 4.2+ automatically assumes that signed overflows do
# not occur in signed arithmetics, whereas we are not
# sure that they will not happen. It furthermore complains
@@ -1406,21 +1408,21 @@ make_compiler_cflags() {
flags="$flags -Wnon-virtual-dtor"
fi
if [ $cc_version -ge 47 ]; then
cxxflags="$cxxflags -std=gnu++11"
elif [ $cc_version -ge 43 ]; then
if [ $cc_version -ge 403 ] && [ $cc_version -lt 407 ]; then
# Use gnu++0x mode so static_assert() is available.
# Don't use c++0x, it breaks mingw (with gcc 4.4.0).
cxxflags="$cxxflags -std=gnu++0x -DDISABLE_OVERRIDE"
elif [ $cc_version -ge 407 ] && [ $cc_version -lt 600 ]; then
cxxflags="$cxxflags -std=gnu++11"
fi
if [ $cc_version -eq 45 ]; then
if [ $cc_version -eq 405 ]; then
# Prevent optimisation supposing enums are in a range specified by the standard
# For details, see http://gcc.gnu.org/PR43680
flags="$flags -fno-tree-vrp"
fi
if [ $cc_version -ge 47 ]; then
if [ $cc_version -ge 407 ]; then
# Disable -Wnarrowing which gives many warnings, such as:
# warning: narrowing conversion of '...' from 'unsigned int' to 'int' inside { } [-Wnarrowing]
# They are valid according to the C++ standard, but useless.
@@ -1429,15 +1431,15 @@ make_compiler_cflags() {
flags="$flags -Wno-free-nonheap-object"
fi
if [ $cc_version -ge 49 ]; then
if [ $cc_version -ge 409 ]; then
# Enable use of C++11 custom allocators
CFLAGS="$CFLAGS -DCUSTOM_ALLOCATOR"
fi
if [ $cc_version -ge 60 ]; then
if [ $cc_version -ge 600 ]; then
# -flifetime-dse=2 (default since GCC 6) doesn't play
# well with our custom pool item allocator
cxxflags="$cxxflags -flifetime-dse=1"
cxxflags="$cxxflags -flifetime-dse=1 -std=gnu++14"
fi
if [ "$enable_lto" != "0" ]; then
@@ -1445,7 +1447,7 @@ make_compiler_cflags() {
has_lto=`$1 -dumpspecs | grep '\%{flto'`
if [ -n "$has_lto" ]; then
# Use LTO only if we see LTO exists and is requested
if [ $cc_version -lt 46 ]; then
if [ $cc_version -lt 406 ]; then
flags="$flags -flto"
else
flags="$flags -flto=jobserver"
@@ -1578,7 +1580,7 @@ make_cflags_and_ldflags() {
fi
fi
if [ "$os" = "OSX" ] && [ $cc_version -eq 40 ]; then
if [ "$os" = "OSX" ] && [ $cc_version -eq 400 ]; then
# Apple's GCC 4.0 has a compiler bug for x86_64 with (higher) optimization,
# wrongly optimizing ^= in loops. This disables the failing optimisation.
CFLAGS="$CFLAGS -fno-expensive-optimizations"
@@ -1602,7 +1604,7 @@ make_cflags_and_ldflags() {
LDFLAGS="$LDFLAGS -mwin32"
fi
if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ]; then
if [ $cc_version -lt 46 ]; then
if [ $cc_version -lt 406 ]; then
flags="$flags -mno-cygwin"
LDFLAGS="$LDFLAGS -mno-cygwin"
fi
@@ -1615,10 +1617,10 @@ make_cflags_and_ldflags() {
LIBS="$LIBS -lws2_32 -lwinmm -lgdi32 -ldxguid -lole32 -limm32"
if [ $cc_version -ge 44 ]; then
if [ $cc_version -ge 404 ]; then
LDFLAGS_BUILD="$LDFLAGS_BUILD -static-libgcc -static-libstdc++"
fi
if [ $cc_version -ge 47 ]; then
if [ $cc_version -ge 407 ]; then
CFLAGS="$CFLAGS -mno-ms-bitfields"
fi
fi
@@ -1872,7 +1874,7 @@ EOL
LDFLAGS="$OSX_LD_SYSROOT $LDFLAGS"
fi
if [ "$enable_universal" = "0" ] && [ $cc_version -gt 40 ]; then
if [ "$enable_universal" = "0" ] && [ $cc_version -gt 400 ]; then
# Only set the min version when not doing an universal build.
# Universal builds set the version elsewhere.
if [ "$cpu_type" = "64" ]; then
@@ -2050,7 +2052,7 @@ EOL
# GCC 4.0+ doesn't like the DirectX includes (gives tons of
# warnings on it we won't be able to fix). For now just
# suppress those warnings.
if [ $cc_version -ge 40 ]; then
if [ $cc_version -ge 400 ]; then
CFLAGS="$CFLAGS -Wno-non-virtual-dtor"
fi
fi

3
src/3rdparty/squirrel/squirrel/sqapi.cpp vendored
View File

@@ -798,7 +798,8 @@ SQRESULT sq_setdelegate(HSQUIRRELVM v,SQInteger idx)
switch(type) {
case OT_TABLE:
if(type(mt) == OT_TABLE) {
if(!_table(self)->SetDelegate(_table(mt))) return sq_throwerror(v, "delagate cycle"); v->Pop();}
if(!_table(self)->SetDelegate(_table(mt))) return sq_throwerror(v, "delagate cycle");
v->Pop();}
else if(type(mt)==OT_NULL) {
_table(self)->SetDelegate(NULL); v->Pop(); }
else return sq_aux_invalidtype(v,type);

2
src/lang/korean.txt
View File

@@ -911,7 +911,7 @@ STR_GAME_OPTIONS_CURRENCY_ISK :아이슬란드
STR_GAME_OPTIONS_CURRENCY_ITL :이탈리아 리라 (ITL)
STR_GAME_OPTIONS_CURRENCY_NLG :네덜란드 길더 (NLG)
STR_GAME_OPTIONS_CURRENCY_NOK :노르웨이 크로네 (NOK)
STR_GAME_OPTIONS_CURRENCY_PLN :폴란드 즐로티 (PLN)
STR_GAME_OPTIONS_CURRENCY_PLN :폴란드 즈워티 (PLN)
STR_GAME_OPTIONS_CURRENCY_RON :루마니아 레우 (RON)
STR_GAME_OPTIONS_CURRENCY_RUR :러시아 루블 (RUR)
STR_GAME_OPTIONS_CURRENCY_SIT :슬로바키아 톨라 (SIT)

36
src/lang/latvian.txt
View File

@@ -562,8 +562,8 @@ STR_MONTH_DEC :Decembris
############ range for months ends
# Graph window
STR_GRAPH_KEY_BUTTON :{BLACK}Leģenda
STR_GRAPH_KEY_TOOLTIP :{BLACK}Diagrammās rādīt leģendas
STR_GRAPH_KEY_BUTTON :{BLACK}Apzīmējumu atslēga
STR_GRAPH_KEY_TOOLTIP :{BLACK}Diagrammās rādīt apzīmējumu atslēgas
STR_GRAPH_X_LABEL_MONTH :{TINY_FONT}{STRING}{} {STRING}
STR_GRAPH_X_LABEL_MONTH_YEAR :{TINY_FONT}{STRING}{} {STRING}{}{NUM}
STR_GRAPH_Y_LABEL :{TINY_FONT}{STRING}
@@ -577,7 +577,7 @@ STR_GRAPH_COMPANY_VALUES_CAPTION :{WHITE}Uzņēmu
STR_GRAPH_CARGO_PAYMENT_RATES_CAPTION :{WHITE}Kravas apmaksas cenas
STR_GRAPH_CARGO_PAYMENT_RATES_X_LABEL :{TINY_FONT}{BLACK}Dienas pārvadājumos
STR_GRAPH_CARGO_PAYMENT_RATES_TITLE :{TINY_FONT}{BLACK}Izmaksas par 10 vienību (vai 10,000 litru) kravas pārvadāšanu par 20mit lauciņiem
STR_GRAPH_CARGO_PAYMENT_RATES_TITLE :{TINY_FONT}{BLACK}Izmaksas par 10 vienību (vai 10,000 litru) kravas pārvadāšanu par 20 lauciņiem
STR_GRAPH_CARGO_ENABLE_ALL :{TINY_FONT}{BLACK}Iespējot visu
STR_GRAPH_CARGO_DISABLE_ALL :{TINY_FONT}{BLACK}Atspējot visu
STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL :{BLACK}Rādīt visas kravas samaksu salīdzināšanas diagrammā
@@ -588,8 +588,8 @@ STR_GRAPH_CARGO_PAYMENT_CARGO :{TINY_FONT}{BLA
STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP :{BLACK}Rādīt detalizētus uzņēmējdarbības vērtējumus
# Graph key window
STR_GRAPH_KEY_CAPTION :{WHITE}Leģendas uzņēmumu diagrammās
STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Klikšķināt šeit, lai izslēgtu/ieslēgtu uzņēmuma iekļaušanu diagrammā
STR_GRAPH_KEY_CAPTION :{WHITE}Apzīmējumu atslēgas uzņēmumu diagrammās
STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Klikšķināt šeit, lai ieslēgtu/izslēgtu uzņēmuma attēlošanu diagrammā
# Company league window
STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Uzņēmumu rangu saraksts
@@ -703,6 +703,7 @@ STR_SMALLMAP_CAPTION :{WHITE}Karte -
STR_SMALLMAP_TYPE_CONTOURS :kontūras
STR_SMALLMAP_TYPE_VEHICLES :transportlīdzekļi
STR_SMALLMAP_TYPE_INDUSTRIES :ražotnes
STR_SMALLMAP_TYPE_ROUTEMAP :kravas plūsma
STR_SMALLMAP_TYPE_ROUTES :maršruti
STR_SMALLMAP_TYPE_VEGETATION :augu valsts
STR_SMALLMAP_TYPE_OWNERS :īpašnieki
@@ -760,6 +761,7 @@ STR_SMALLMAP_TOOLTIP_SHOW_HEIGHT :{BLACK}Pārslē
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_COMPANIES :{BLACK}Nerādīt neviena uzņēmuma īpašumus uz kartes
STR_SMALLMAP_TOOLTIP_ENABLE_ALL_COMPANIES :{BLACK}Rādīt visu uzņēmumu īpašumus uz kartes
STR_SMALLMAP_TOOLTIP_DISABLE_ALL_CARGOS :{BLACK}Nerādīt kravas uz kartes
STR_SMALLMAP_TOOLTIP_ENABLE_ALL_CARGOS :{BLACK}Rādīt visas kravas uz kartes
# Status bar messages
STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS :{BLACK}Rādīt pēdējo ziņojumu vai avīzes rakstu
@@ -1338,6 +1340,7 @@ STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_OFF :Izslēgta
STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING :Kreisā klikšķa ritināšana: {STRING}
STR_CONFIG_SETTING_AUTOSAVE :Automātiskā saglabāšana: {STRING}
STR_CONFIG_SETTING_AUTOSAVE_HELPTEXT :Izvēlēties spēles automātiskās saglabāšanas starplaikus
STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES :Lietot {STRING} datuma formātu saglabāto spēļu nosaukumos
STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_HELPTEXT :Datuma formāts spēļu saglabājuma failu nosaukumos
@@ -2215,9 +2218,15 @@ STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Pārslē
STR_TRANSPARENT_INVISIBLE_TOOLTIP :{BLACK}Caurspīdības vietā objektus padarīt neredzamus
# Linkgraph legend window
STR_LINKGRAPH_LEGEND_SELECT_COMPANIES :{BLACK}Atzīmēt kompānijas kuras uzrādīt
STR_LINKGRAPH_LEGEND_CAPTION :{BLACK}Kravas plūsmas apzīmējumi
STR_LINKGRAPH_LEGEND_ALL :{BLACK}Visi
STR_LINKGRAPH_LEGEND_NONE :{BLACK}Neviens
STR_LINKGRAPH_LEGEND_SELECT_COMPANIES :{BLACK}Izvēlēties attēlojamos uzņēmumus
# Linkgraph legend window and linkgraph legend in smallmap
STR_LINKGRAPH_LEGEND_UNUSED :{TINY_FONT}{BLACK}nelietots
STR_LINKGRAPH_LEGEND_SATURATED :{TINY_FONT}{BLACK}piesātināts
STR_LINKGRAPH_LEGEND_OVERLOADED :{TINY_FONT}{BLACK}pārslogots
# Base for station construction window(s)
STR_STATION_BUILD_COVERAGE_AREA_TITLE :{BLACK}Pārklājuma iezīmēšana
@@ -3008,6 +3017,7 @@ STR_SUBSIDIES_SUBSIDISED_FROM_TO :{ORANGE}{STRING
STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER :{BLACK}Klikšķināt uz servisa, lai iecentrētu skatu uz rūpnīcu/pilsētu. Ctrl+klikšķis atvērs jaunu skatu lauku uz pilsētu/rūpnīcu
# Story book window
STR_STORY_BOOK_CAPTION :{WHITE}{COMPANY} Stāstu grāmata
STR_STORY_BOOK_SPECTATOR_CAPTION :{WHITE}Globālā stāstu grāmata
STR_STORY_BOOK_TITLE :{YELLOW}{STRING}
STR_STORY_BOOK_GENERIC_PAGE_ITEM :{NUM} lapa
@@ -3815,7 +3825,7 @@ STR_TIMETABLE_TOOLTIP :{BLACK}Saraksts
STR_TIMETABLE_NO_TRAVEL :Bez braukšanas
STR_TIMETABLE_NOT_TIMETABLEABLE :Ceļot (automātiski; pēc nākamā manuālā rīkojuma saraksta)
STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Braukšana (nav pēc saraksta)
STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Braukšana (nav sarakstā)
STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED :Braukt ar ne vairāk kā {2:VELOCITY} (nav sarakstā)
STR_TIMETABLE_TRAVEL_FOR :Braukt līdz {STRING}
STR_TIMETABLE_TRAVEL_FOR_SPEED :Braukt uz {STRING} ar ne vairāk kā {VELOCITY}
@@ -4242,7 +4252,7 @@ STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}Vispirms
STR_ERROR_CAN_T_START_AND_END_ON :{WHITE}Nevar sākties un beigties tajā paša vietā
STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT :{WHITE}Tilta gali nav vienā līmenī
STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN :{WHITE}Tilts ir pārāk zems šim zemes apvidum
STR_ERROR_BRIDGE_TOO_HIGH_FOR_TERRAIN :{WHITE}Tilts ir pārāk augsts priekš šī vilciena.
STR_ERROR_BRIDGE_TOO_HIGH_FOR_TERRAIN :{WHITE}Tilts ir pārāk augsts šim zemes apvidum.
STR_ERROR_START_AND_END_MUST_BE_IN :{WHITE}Sākumam un beigām jābūt uz vienas līnijas
STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH :{WHITE}... abiem tilta galiem jābūt uz zemes
STR_ERROR_BRIDGE_TOO_LONG :{WHITE}... tilts ir pārāk garš
@@ -4269,7 +4279,7 @@ STR_ERROR_YOU_ALREADY_OWN_IT :{WHITE}... tā
STR_ERROR_GROUP_CAN_T_CREATE :{WHITE}Nevar izveidot grupu...
STR_ERROR_GROUP_CAN_T_DELETE :{WHITE}Nevar izdzēst šo grupu...
STR_ERROR_GROUP_CAN_T_RENAME :{WHITE}Nevar pārdēvēt grupu...
STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES :{WHITE}No šīs grupas nevar noņemt visus transportlīdzekļus...
STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES :{WHITE}Nevar noņemt no šīs grupas visus transportlīdzekļus...
STR_ERROR_GROUP_CAN_T_ADD_VEHICLE :{WHITE}Nevar pievienot transportlīdzekļus šai grupai...
STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE :{WHITE}Nevar pievienot koplietojamos transportlīdzekļus šai grupai...
@@ -4285,8 +4295,8 @@ STR_ERROR_CAN_T_REFIT_SHIP :{WHITE}Nevar pi
STR_ERROR_CAN_T_REFIT_AIRCRAFT :{WHITE}Nevar pielāgot lidaparātu...
STR_ERROR_CAN_T_RENAME_TRAIN :{WHITE}Nevar nosaukt vilcienu...
STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}Autotransporta līdzekli nevar nosaukt...
STR_ERROR_CAN_T_RENAME_SHIP :{WHITE}Nevar pārdēvēt kuģi...
STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}Nevar nosaukt autotransporta līdzekli...
STR_ERROR_CAN_T_RENAME_SHIP :{WHITE}Nevar nosaukt kuģi...
STR_ERROR_CAN_T_RENAME_AIRCRAFT :{WHITE}Nevar nosaukt lidaparātu...
STR_ERROR_CAN_T_STOP_START_TRAIN :{WHITE}Nevar apturēt/palaist vilcienu...
@@ -4372,6 +4382,10 @@ STR_ERROR_CAN_T_DELETE_SIGN :{WHITE}Nevar dz
STR_DESKTOP_SHORTCUT_COMMENT :Uz 'Transport Tycoon Deluxe' balstīta simulācijas spēle
# Translatable descriptions in media/baseset/*.ob* files
STR_BASEGRAPHICS_DOS_DESCRIPTION :Oriģinālā Transport Tycoon Deluxe DOS izdevuma grafika.
STR_BASEGRAPHICS_DOS_DE_DESCRIPTION :Oriģinālā Transport Tycoon Deluxe DOS (vācu) izdevuma grafika.
STR_BASEGRAPHICS_WIN_DESCRIPTION :Oriģinālā Transport Tycoon Deluxe Windows izdevuma grafika.
STR_BASESOUNDS_NONE_DESCRIPTION :Skaņu kopa bez skaņas.
STR_BASEMUSIC_WIN_DESCRIPTION :Oriģinālā Transport Tycoon Deluxe Windows izdevuma mūzika.
STR_BASEMUSIC_NONE_DESCRIPTION :Mūzikas kopa bez mūzikas

44
src/lang/spanish.txt
View File

@@ -111,7 +111,7 @@ STR_QUANTITY_COPPER_ORE :{WEIGHT_LONG} d
STR_QUANTITY_MAIZE :{WEIGHT_LONG} de maíz
STR_QUANTITY_FRUIT :{WEIGHT_LONG} de fruta
STR_QUANTITY_DIAMONDS :{COMMA}{NBSP}bolsa{P "" s} de diamantes
STR_QUANTITY_FOOD :{WEIGHT_LONG} de alimento
STR_QUANTITY_FOOD :{WEIGHT_LONG} de alimentos
STR_QUANTITY_PAPER :{WEIGHT_LONG} de papel
STR_QUANTITY_GOLD :{COMMA}{NBSP}bolsa{P "" s} de oro
STR_QUANTITY_WATER :{VOLUME_LONG} de agua
@@ -229,10 +229,10 @@ STR_LIST_FILTER_TITLE :{BLACK}Patrón
STR_LIST_FILTER_OSKTITLE :{BLACK}Escriba un patrón de filtrado
STR_LIST_FILTER_TOOLTIP :{BLACK}Introduzca una palabra clave para filtrar la lista
STR_TOOLTIP_GROUP_ORDER :{BLACK}Seleccionar orden de agrupamiento
STR_TOOLTIP_SORT_ORDER :{BLACK}Seleccione ordenación (descendiente/ascendiente)
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Seleccione criterio de orden
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Seleccione criterio de filtrado
STR_TOOLTIP_GROUP_ORDER :{BLACK}Selecciona orden de agrupamiento
STR_TOOLTIP_SORT_ORDER :{BLACK}Selecciona orden de clasificación (descendiente/ascendiente)
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Selecciona orden de clasificación
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Selecciona criterio de filtrado
STR_BUTTON_SORT_BY :{BLACK}Ordenar por
STR_BUTTON_LOCATION :{BLACK}Sitio
STR_BUTTON_RENAME :{BLACK}Renombrar
@@ -978,7 +978,7 @@ STR_GAME_OPTIONS_FULLSCREEN :{BLACK}Pantalla
STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP :{BLACK}Marca esta opción para jugar OpenTTD a pantalla completa
STR_GAME_OPTIONS_RESOLUTION :{BLACK}Resolución de pantalla
STR_GAME_OPTIONS_RESOLUTION_TOOLTIP :{BLACK}Seleccione la resolución de pantalla a usar
STR_GAME_OPTIONS_RESOLUTION_TOOLTIP :{BLACK}Selecciona la resolución de pantalla a usar
STR_GAME_OPTIONS_RESOLUTION_OTHER :Otras
STR_GAME_OPTIONS_GUI_ZOOM_FRAME :{BLACK}Tamaño de la interfaz
@@ -3102,7 +3102,7 @@ STR_STATION_LIST_STATION :{YELLOW}{STATIO
STR_STATION_LIST_WAYPOINT :{YELLOW}{WAYPOINT}
STR_STATION_LIST_NONE :{YELLOW}- Ninguna -
STR_STATION_LIST_SELECT_ALL_FACILITIES :{BLACK}Seleccionar todos los tipos de estación
STR_STATION_LIST_SELECT_ALL_TYPES :{BLACK}Seleccionar todos los tipos de carga (incluidas las que no están en espera)
STR_STATION_LIST_SELECT_ALL_TYPES :{BLACK}Selecciona todos los tipos de carga (incluidas las que no están en espera)
STR_STATION_LIST_NO_WAITING_CARGO :{BLACK}Ningún tipo de carga está esperando
# Station view window
@@ -3321,7 +3321,7 @@ STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR :{TINY_FONT}{BLA
STR_VEHICLE_LIST_AVAILABLE_TRAINS :Trenes disponibles
STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES :Vehículos de carretera disponibles
STR_VEHICLE_LIST_AVAILABLE_SHIPS :Barcos disponibles
STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT :Aviones disponibles
STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT :Aeronaves disponibles
STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP :{BLACK}Ver la lista de modelos disponibles para este tipo de vehículo
STR_VEHICLE_LIST_MANAGE_LIST :{BLACK}Administrar lista
@@ -3768,7 +3768,7 @@ STR_ORDER_TOOLTIP_UNLOAD :{BLACK}Cambiar
STR_ORDER_REFIT :{BLACK}Reformar
STR_ORDER_REFIT_TOOLTIP :{BLACK}Selecciona el tipo de carga a reformar en esta orden. Ctrl+Click para eliminar la orden de reforma
STR_ORDER_REFIT_AUTO :{BLACK}Reforma en la estación
STR_ORDER_REFIT_AUTO_TOOLTIP :{BLACK}Seleccionar el tipo de carga a la que reformar en esta orden. Ctrl+Click elimina la orden de reforma. La reforma solamente puede llevarse a cabo si el vehículo lo permite
STR_ORDER_REFIT_AUTO_TOOLTIP :{BLACK}Selecciona el tipo de carga a reformar en esta orden. Ctrl+Click elimina la orden de reforma. La reforma solamente puede llevarse a cabo si el vehículo lo permite
STR_ORDER_DROP_REFIT_AUTO :Carga fijada
STR_ORDER_DROP_REFIT_AUTO_ANY :Carga disponible
@@ -3961,9 +3961,9 @@ STR_AI_DEBUG_NAME_AND_VERSION :{BLACK}{STRING}
STR_AI_DEBUG_NAME_TOOLTIP :{BLACK}Nombre del script
STR_AI_DEBUG_SETTINGS :{BLACK}Configuración
STR_AI_DEBUG_SETTINGS_TOOLTIP :{BLACK}Cambiar la configuración del script
STR_AI_DEBUG_RELOAD :{BLACK}Recarga la IA
STR_AI_DEBUG_RELOAD :{BLACK}Recargar IA
STR_AI_DEBUG_RELOAD_TOOLTIP :{BLACK}Elimina la IA, recarga el código y reinicia la IA
STR_AI_DEBUG_BREAK_STR_ON_OFF_TOOLTIP :{BLACK}Activar/desactivar la pausa automática cuando un mensaje de log de la IA coincide con la cadena de parada
STR_AI_DEBUG_BREAK_STR_ON_OFF_TOOLTIP :{BLACK}Activa/desactiva la pausa automática cuando un mensaje de log de la IA coincide con la cadena de parada
STR_AI_DEBUG_BREAK_ON_LABEL :{BLACK}Pausar con:
STR_AI_DEBUG_BREAK_STR_OSKTITLE :{BLACK}Pausar cuando el script registre esta cadena
STR_AI_DEBUG_BREAK_STR_TOOLTIP :{BLACK}Cuando un mensaje de log de una IA coincide con esta cadena, el juego se pausa
@@ -3980,7 +3980,7 @@ STR_ERROR_AI_PLEASE_REPORT_CRASH :{WHITE}Uno de l
STR_ERROR_AI_DEBUG_SERVER_ONLY :{YELLOW}La ventana de depuración de scripts solo está disponible para el servidor
# AI configuration window
STR_AI_CONFIG_CAPTION :{WHITE}Configuración de Scripts
STR_AI_CONFIG_CAPTION :{WHITE}Configuración de Scripts de Juego / IA
STR_AI_CONFIG_GAMELIST_TOOLTIP :{BLACK}Script de Juego que será cargada en la próxima partida
STR_AI_CONFIG_AILIST_TOOLTIP :{BLACK}IAs que serán cargadas en la próxima partida
STR_AI_CONFIG_HUMAN_PLAYER :Jugador Humano
@@ -4478,7 +4478,7 @@ STR_BASEMUSIC_NONE_DESCRIPTION :Un conjunto de
# Town building names
STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1 :Bloque alto de oficinas
STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_1 :Bloque de oficinas
STR_TOWN_BUILDING_NAME_SMALL_BLOCK_OF_FLATS_1 :Bloque de viviendas pequeño
STR_TOWN_BUILDING_NAME_SMALL_BLOCK_OF_FLATS_1 :Bloque de apartamentos pequeño
STR_TOWN_BUILDING_NAME_CHURCH_1 :Iglesia
STR_TOWN_BUILDING_NAME_LARGE_OFFICE_BLOCK_1 :Gran bloque de oficinas
STR_TOWN_BUILDING_NAME_TOWN_HOUSES_1 :Casas del municipio
@@ -4630,7 +4630,7 @@ STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_WOOD_TRUCK :Vagón de Mader
STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_IRON_ORE_HOPPER :Vagoneta de Mineral de Hierro
STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_STEEL_TRUCK :Vagón de Acero
STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_ARMORED_VAN :Vagón Blindado
STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_FOOD_VAN :Vagón de Alimento
STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_FOOD_VAN :Vagón de Alimentos
STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_PAPER_TRUCK :Vagón de Papel
STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_COPPER_ORE_HOPPER :Vagoneta de Mineral de Cobre
STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_WATER_TANKER :Cisterna de Agua
@@ -4660,7 +4660,7 @@ STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_WOOD_TRUCK :Vagón de Mader
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_IRON_ORE_HOPPER :Vagoneta de Mineral de Hierro
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_STEEL_TRUCK :Vagón de Acero
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_ARMORED_VAN :Vagón Blindado
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_FOOD_VAN :Vagón de Alimento
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_FOOD_VAN :Vagón de Alimentos
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_PAPER_TRUCK :Vagón de Papel
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_COPPER_ORE_HOPPER :Vagoneta de Mineral de Cobre
STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_WATER_TANKER :Cisterna de Agua
@@ -4692,7 +4692,7 @@ STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_WOOD_TRUCK :Vagón de Mader
STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_IRON_ORE_HOPPER :Vagoneta de Mineral de Hierro
STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_STEEL_TRUCK :Vagón de Acero
STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_ARMORED_VAN :Vagón Blindado
STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_FOOD_VAN :Vagón de Alimento
STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_FOOD_VAN :Vagón de Alimentos
STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_PAPER_TRUCK :Vagón de Papel
STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_COPPER_ORE_HOPPER :Vagoneta de Mineral de Cobre
STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_WATER_TANKER :Cisterna de Agua
@@ -4733,9 +4733,9 @@ STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_LIVESTOCK_VAN :Camión de Gana
STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_GOODS_TRUCK :Camión de Mercancías Balogh
STR_VEHICLE_NAME_ROAD_VEHICLE_CRAIGHEAD_GOODS_TRUCK :Camión de Mercancías Craighead
STR_VEHICLE_NAME_ROAD_VEHICLE_GOSS_GOODS_TRUCK :Camión de Mercancías Goss
STR_VEHICLE_NAME_ROAD_VEHICLE_HEREFORD_GRAIN_TRUCK :Camión Granero Hereford
STR_VEHICLE_NAME_ROAD_VEHICLE_THOMAS_GRAIN_TRUCK :Camión Granero Thomas
STR_VEHICLE_NAME_ROAD_VEHICLE_GOSS_GRAIN_TRUCK :Camión Granero Goss
STR_VEHICLE_NAME_ROAD_VEHICLE_HEREFORD_GRAIN_TRUCK :Camión de Grano Hereford
STR_VEHICLE_NAME_ROAD_VEHICLE_THOMAS_GRAIN_TRUCK :Camión de Grano Thomas
STR_VEHICLE_NAME_ROAD_VEHICLE_GOSS_GRAIN_TRUCK :Camión de Grano Goss
STR_VEHICLE_NAME_ROAD_VEHICLE_WITCOMBE_WOOD_TRUCK :Camión Maderero Witcombe
STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_WOOD_TRUCK :Camión Maderero Foster
STR_VEHICLE_NAME_ROAD_VEHICLE_MORELAND_WOOD_TRUCK :Camión Maderero Moreland
@@ -4748,9 +4748,9 @@ STR_VEHICLE_NAME_ROAD_VEHICLE_KELLING_STEEL_TRUCK :Camión de Acer
STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_ARMORED_TRUCK :Furgón Blindado Balogh
STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_ARMORED_TRUCK :Furgón Blindado Uhl
STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_ARMORED_TRUCK :Furgón Blindado Foster
STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_FOOD_VAN :Furgón de Comida Foster
STR_VEHICLE_NAME_ROAD_VEHICLE_PERRY_FOOD_VAN :Furgón de Comida Perry
STR_VEHICLE_NAME_ROAD_VEHICLE_CHIPPY_FOOD_VAN :Furgón de Comida Chippy
STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_FOOD_VAN :Furgón de Alimentos Foster
STR_VEHICLE_NAME_ROAD_VEHICLE_PERRY_FOOD_VAN :Furgón de Alimentos Perry
STR_VEHICLE_NAME_ROAD_VEHICLE_CHIPPY_FOOD_VAN :Furgón de Alimentos Chippy
STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_PAPER_TRUCK :Camión de Papel Uhl
STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_PAPER_TRUCK :Camión de Papel Balogh
STR_VEHICLE_NAME_ROAD_VEHICLE_MPS_PAPER_TRUCK :Camión de Papel MPS

8
src/lang/spanish_MX.txt
View File

@@ -301,7 +301,7 @@ STR_SORT_BY_WAITING_TOTAL :Cargamento tota
STR_SORT_BY_WAITING_AVAILABLE :Cargamento disponible en espera
STR_SORT_BY_RATING_MAX :Valoración más alta de cargamento
STR_SORT_BY_RATING_MIN :Valoración más baja de cargamento
STR_SORT_BY_ENGINE_ID :Id. de locomotora (orden clásico)
STR_SORT_BY_ENGINE_ID :EngineID (classic sort)Id. locomotora (orden clásico)
STR_SORT_BY_COST :Costo
STR_SORT_BY_POWER :Potencia
STR_SORT_BY_TRACTIVE_EFFORT :Fuerza de tracción
@@ -893,7 +893,7 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Selecci
############ start of currency region
STR_GAME_OPTIONS_CURRENCY_GBP :Libra británica (GBP)
STR_GAME_OPTIONS_CURRENCY_USD :Dólar americano (USD)
STR_GAME_OPTIONS_CURRENCY_USD :Dólar estadounidense (USD)
STR_GAME_OPTIONS_CURRENCY_EUR :Euro (EUR)
STR_GAME_OPTIONS_CURRENCY_JPY :Yen japonés (¥)
STR_GAME_OPTIONS_CURRENCY_ATS :Chelín austríaco (ATS)
@@ -1008,7 +1008,7 @@ STR_ERROR_FULLSCREEN_FAILED :{WHITE}El modo
# Custom currency window
STR_CURRENCY_WINDOW :{WHITE}Moneda personalizada
STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Tasa de cambio: {ORANGE}{CURRENCY_LONG} = £ {COMMA}
STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Tasa de cambio: {ORANGE} {CURRENCY_LONG} = £ {COMMA}
STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP :{BLACK}Reducir el valor de la moneda por una libra (£)
STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP :{BLACK}Incrementar el valor de la moneda por una libra (£)
STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP :{BLACK}Ajustar el valor de cambio de la moneda por una Libra (£)
@@ -1027,7 +1027,7 @@ STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP :{BLACK}Establec
STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP :{BLACK}Cambiar a euro antes
STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP :{BLACK}Cambiar a euro después
STR_CURRENCY_PREVIEW :{LTBLUE}Vista previa: {ORANGE}{CURRENCY_LONG}
STR_CURRENCY_PREVIEW :{LTBLUE}Vista previa: {ORANGE} {CURRENCY_LONG}
STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP :{BLACK}10000 libras (£) en la moneda
STR_CURRENCY_CHANGE_PARAMETER :{BLACK}Cambiar parámetro de moneda personalizada

18
src/linkgraph/demands.cpp
View File

@@ -2,11 +2,11 @@
#include "../stdafx.h"
#include "demands.h"
#include <deque>
#include <queue>
#include "../safeguards.h"
typedef std::deque<NodeID> NodeList;
typedef std::queue<NodeID> NodeList;
/**
* Scale various things according to symmetric/asymmetric distribution.
@@ -172,11 +172,11 @@ void DemandCalculator::CalcDemand(LinkGraphJob &job, Tscaler scaler)
for (NodeID node = 0; node < job.Size(); node++) {
scaler.AddNode(job[node]);
if (job[node].Supply() > 0) {
supplies.push_back(node);
supplies.push(node);
num_supplies++;
}
if (job[node].Demand() > 0) {
demands.push_back(node);
demands.push(node);
num_demands++;
}
}
@@ -191,17 +191,17 @@ void DemandCalculator::CalcDemand(LinkGraphJob &job, Tscaler scaler)
while (!supplies.empty() && !demands.empty()) {
NodeID from_id = supplies.front();
supplies.pop_front();
supplies.pop();
for (uint i = 0; i < num_demands; ++i) {
assert(!demands.empty());
NodeID to_id = demands.front();
demands.pop_front();
demands.pop();
if (from_id == to_id) {
/* Only one node with supply and demand left */
if (demands.empty() && supplies.empty()) return;
demands.push_back(to_id);
demands.push(to_id);
continue;
}
@@ -236,7 +236,7 @@ void DemandCalculator::CalcDemand(LinkGraphJob &job, Tscaler scaler)
scaler.SetDemands(job, from_id, to_id, demand_forw);
if (scaler.HasDemandLeft(job[to_id])) {
demands.push_back(to_id);
demands.push(to_id);
} else {
num_demands--;
}
@@ -245,7 +245,7 @@ void DemandCalculator::CalcDemand(LinkGraphJob &job, Tscaler scaler)
}
if (job[from_id].UndeliveredSupply() != 0) {
supplies.push_back(from_id);
supplies.push(from_id);
} else {
num_supplies--;
}

1
src/linkgraph/mcf.cpp
View File

@@ -68,6 +68,7 @@ public:
*/
class CapacityAnnotation : public Path {
int cached_annotation;
public:
typedef int AnnotationValueType;

5
src/linkgraph/refresh.cpp
View File

@@ -72,9 +72,7 @@ LinkRefresher::LinkRefresher(Vehicle *vehicle, HopSet *seen_hops, bool allow_mer
vehicle(vehicle), seen_hops(seen_hops), cargo(CT_INVALID), allow_merge(allow_merge),
is_full_loading(is_full_loading)
{
for (CargoID cargo_type = 0; cargo_type < NUM_CARGO; cargo_type++) {
this->capacities[cargo_type] = 0;
}
memset(this->capacities, 0, sizeof(this->capacities));
/* Assemble list of capacities and set last loading stations to 0. */
for (Vehicle *v = this->vehicle; v != NULL; v = v->Next()) {
@@ -211,7 +209,6 @@ void LinkRefresher::RefreshStats(const Order *cur, const Order *next)
/* Refresh the link and give it a minimum capacity. */
uint cargo_quantity = this->capacities[c];
if (cargo_quantity == 0) continue;
/* If not allowed to merge link graphs, make sure the stations are

4
src/linkgraph/refresh.h
View File

@@ -14,7 +14,7 @@
#include "../cargo_type.h"
#include "../vehicle_base.h"
#include <deque>
#include <vector>
#include <map>
#include <set>
@@ -79,7 +79,7 @@ protected:
bool operator<(const Hop &other) const;
};
typedef std::deque<RefitDesc> RefitList;
typedef std::vector<RefitDesc> RefitList;
typedef std::set<Hop> HopSet;
Vehicle *vehicle; ///< Vehicle for which the links should be refreshed.

4
src/newgrf_spritegroup.cpp
View File

@@ -204,8 +204,8 @@ static U EvalAdjustT(const DeterministicSpriteGroupAdjust *adjust, ScopeResolver
if (adjust->type != DSGA_TYPE_NONE) value += (S)adjust->add_val;
switch (adjust->type) {
case DSGA_TYPE_DIV: value /= (S)adjust->divmod_val; break;
case DSGA_TYPE_MOD: value %= (U)adjust->divmod_val; break;
case DSGA_TYPE_DIV: value = (S)value / (S)adjust->divmod_val; break;
case DSGA_TYPE_MOD: value = (S)value % (S)adjust->divmod_val; break;
case DSGA_TYPE_NONE: break;
}

79
src/smallmap_gui.cpp
View File

@@ -320,26 +320,10 @@ void BuildOwnerLegend()
_smallmap_company_count = i;
}
static inline TileType GetEffectiveTileType(TileIndex tile)
{
TileType t = GetTileType(tile);
if (t == MP_TUNNELBRIDGE) {
TransportType tt = GetTunnelBridgeTransportType(tile);
switch (tt) {
case TRANSPORT_RAIL: t = MP_RAILWAY; break;
case TRANSPORT_ROAD: t = MP_ROAD; break;
default: t = MP_WATER; break;
}
}
return t;
}
/**
* Return the colour a tile would be displayed with in the small map in mode "Contour".
* @param tile The tile of which we would like to get the colour.
* @param t Effective tile type of the tile (see #GetEffectiveTileType).
* @param t Effective tile type of the tile (see #GetTileColours).
* @return The colour of tile in the small map in mode "Contour"
*/
static inline uint32 GetSmallMapContoursPixels(TileIndex tile, TileType t)
@@ -352,7 +336,7 @@ static inline uint32 GetSmallMapContoursPixels(TileIndex tile, TileType t)
* Return the colour a tile would be displayed with in the small map in mode "Vehicles".
*
* @param tile The tile of which we would like to get the colour.
* @param t Effective tile type of the tile (see #GetEffectiveTileType).
* @param t Effective tile type of the tile (see #GetTileColours).
* @return The colour of tile in the small map in mode "Vehicles"
*/
static inline uint32 GetSmallMapVehiclesPixels(TileIndex tile, TileType t)
@@ -365,23 +349,11 @@ static inline uint32 GetSmallMapVehiclesPixels(TileIndex tile, TileType t)
* Return the colour a tile would be displayed with in the small map in mode "Industries".
*
* @param tile The tile of which we would like to get the colour.
* @param t Effective tile type of the tile (see #GetEffectiveTileType).
* @param t Effective tile type of the tile (see #GetTileColours).
* @return The colour of tile in the small map in mode "Industries"
*/
static inline uint32 GetSmallMapIndustriesPixels(TileIndex tile, TileType t)
{
if (t == MP_INDUSTRY) {
/* If industry is allowed to be seen, use its colour on the map */
IndustryType type = Industry::GetByTile(tile)->type;
if (_legend_from_industries[_industry_to_list_pos[type]].show_on_map &&
(_smallmap_industry_highlight_state || type != _smallmap_industry_highlight)) {
return (type == _smallmap_industry_highlight ? PC_WHITE : GetIndustrySpec(Industry::GetByTile(tile)->type)->map_colour) * 0x01010101;
} else {
/* Otherwise, return the colour which will make it disappear */
t = (IsTileOnWater(tile) ? MP_WATER : MP_CLEAR);
}
}
const SmallMapColourScheme *cs = &_heightmap_schemes[_settings_client.gui.smallmap_land_colour];
return ApplyMask(_smallmap_show_heightmap ? cs->height_colours[TileHeight(tile)] : cs->default_colour, &_smallmap_vehicles_andor[t]);
}
@@ -390,7 +362,7 @@ static inline uint32 GetSmallMapIndustriesPixels(TileIndex tile, TileType t)
* Return the colour a tile would be displayed with in the small map in mode "Routes".
*
* @param tile The tile of which we would like to get the colour.
* @param t Effective tile type of the tile (see #GetEffectiveTileType).
* @param t Effective tile type of the tile (see #GetTileColours).
* @return The colour of tile in the small map in mode "Routes"
*/
static inline uint32 GetSmallMapRoutesPixels(TileIndex tile, TileType t)
@@ -423,7 +395,7 @@ static inline uint32 GetSmallMapRoutesPixels(TileIndex tile, TileType t)
* Return the colour a tile would be displayed with in the small map in mode "link stats".
*
* @param tile The tile of which we would like to get the colour.
* @param t Effective tile type of the tile (see #GetEffectiveTileType).
* @param t Effective tile type of the tile (see #GetTileColours).
* @return The colour of tile in the small map in mode "link stats"
*/
static inline uint32 GetSmallMapLinkStatsPixels(TileIndex tile, TileType t)
@@ -435,7 +407,7 @@ static inline uint32 GetSmallMapLinkStatsPixels(TileIndex tile, TileType t)
* Return the colour a tile would be displayed with in the smallmap in mode "Vegetation".
*
* @param tile The tile of which we would like to get the colour.
* @param t Effective tile type of the tile (see #GetEffectiveTileType).
* @param t Effective tile type of the tile (see #GetTileColours).
* @return The colour of tile in the smallmap in mode "Vegetation"
*/
static inline uint32 GetSmallMapVegetationPixels(TileIndex tile, TileType t)
@@ -462,7 +434,7 @@ static inline uint32 GetSmallMapVegetationPixels(TileIndex tile, TileType t)
* Return the colour a tile would be displayed with in the small map in mode "Owner".
*
* @param tile The tile of which we would like to get the colour.
* @param t Effective tile type of the tile (see #GetEffectiveTileType).
* @param t Effective tile type of the tile (see #GetTileColours).
* @return The colour of tile in the small map in mode "Owner"
*/
static inline uint32 GetSmallMapOwnerPixels(TileIndex tile, TileType t)
@@ -660,7 +632,42 @@ inline uint32 SmallMapWindow::GetTileColours(const TileArea &ta) const
TileType et = MP_VOID; // Effective tile type at that position.
TILE_AREA_LOOP(ti, ta) {
TileType ttype = GetEffectiveTileType(ti);
TileType ttype = GetTileType(ti);
switch (ttype) {
case MP_TUNNELBRIDGE: {
TransportType tt = GetTunnelBridgeTransportType(ti);
switch (tt) {
case TRANSPORT_RAIL: ttype = MP_RAILWAY; break;
case TRANSPORT_ROAD: ttype = MP_ROAD; break;
default: ttype = MP_WATER; break;
}
break;
}
case MP_INDUSTRY:
/* Special handling of industries while in "Industries" smallmap view. */
if (this->map_type == SMT_INDUSTRY) {
/* If industry is allowed to be seen, use its colour on the map.
* This has the highest priority above any value in _tiletype_importance. */
IndustryType type = Industry::GetByTile(ti)->type;
if (_legend_from_industries[_industry_to_list_pos[type]].show_on_map) {
if (type == _smallmap_industry_highlight) {
if (_smallmap_industry_highlight_state) return MKCOLOUR_XXXX(PC_WHITE);
} else {
return GetIndustrySpec(type)->map_colour * 0x01010101;
}
}
/* Otherwise make it disappear */
ttype = IsTileOnWater(ti) ? MP_WATER : MP_CLEAR;
}
break;
default:
break;
}
if (_tiletype_importance[ttype] > importance) {
importance = _tiletype_importance[ttype];
tile = ti;

6
src/strings.cpp
View File

@@ -36,7 +36,9 @@
#include "debug.h"
#include "unit_conversion.h"
#include "game/game_text.hpp"
#include "network/network_content_gui.h"
#ifdef ENABLE_NETWORK
# include "network/network_content_gui.h"
#endif /* ENABLE_NETWORK */
#include <stack>
#include "table/strings.h"
@@ -2055,7 +2057,9 @@ bool ReadLanguagePack(const LanguageMetadata *lang)
SortIndustryTypes();
BuildIndustriesLegend();
SortNetworkLanguages();
#ifdef ENABLE_NETWORK
BuildContentTypeStringList();
#endif /* ENABLE_NETWORK */
InvalidateWindowClassesData(WC_BUILD_VEHICLE); // Build vehicle window.
InvalidateWindowClassesData(WC_TRAINS_LIST); // Train group window.
InvalidateWindowClassesData(WC_ROADVEH_LIST); // Road vehicle group window.