summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lang/american.txt14
-rw-r--r--lang/brazilian_portuguese.txt14
-rw-r--r--lang/catalan.txt14
-rw-r--r--lang/czech.txt14
-rw-r--r--lang/danish.txt14
-rw-r--r--lang/dutch.txt14
-rw-r--r--lang/english.txt23
-rw-r--r--lang/estonian.txt14
-rw-r--r--lang/finnish.txt14
-rw-r--r--lang/french.txt14
-rw-r--r--lang/galician.txt14
-rw-r--r--lang/german.txt14
-rw-r--r--lang/hungarian.txt14
-rw-r--r--lang/icelandic.txt14
-rw-r--r--lang/italian.txt14
-rw-r--r--lang/norwegian.txt14
-rw-r--r--lang/polish.txt14
-rw-r--r--lang/portuguese.txt14
-rw-r--r--lang/romanian.txt14
-rw-r--r--lang/slovak.txt14
-rw-r--r--lang/spanish.txt14
-rw-r--r--lang/swedish.txt14
-rw-r--r--lang/turkish.txt14
-rw-r--r--main_gui.c59
24 files changed, 59 insertions, 331 deletions
diff --git a/lang/american.txt b/lang/american.txt
index a3e01315d..62a9607ba 100644
--- a/lang/american.txt
+++ b/lang/american.txt
@@ -753,32 +753,20 @@ STR_02C0_SAVE_CUSTOM_NAMES :{BLACK}Save cus
STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION :{BLACK}Vehicle design names selection
STR_02C2_SAVE_CUSTOMIZED_VEHICLE :{BLACK}Save customized vehicle design names
+STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_02C3_GAME_OPTIONS :Game options
-STR_02C4_GAME_OPTIONS :Game options
STR_02C5_DIFFICULTY_SETTINGS :Difficulty settings
-STR_02C6_DIFFICULTY_SETTINGS :Difficulty settings
STR_02C7_CONFIG_PATCHES :Configure patches
-STR_02C8_CONFIG_PATCHES :Configure patches
STR_NEWGRF_SETTINGS :Newgrf settings
-STR_NEWGRF_SETTINGS2 :Newgrf settings
STR_GAMEOPTMENU_0A :
-STR_GAMEOPTMENU_0B :
-STR_02C9_TOWN_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Town names displayed
STR_02CA_TOWN_NAMES_DISPLAYED :{SETX 12}Town names displayed
-STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Station names displayed
STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Station names displayed
-STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Signs displayed
STR_02CE_SIGNS_DISPLAYED :{SETX 12}Signs displayed
-STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Waypoints displayed
STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Waypoints displayed
-STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Full animation
STR_02D0_FULL_ANIMATION :{SETX 12}Full animation
-STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Full detail
STR_02D2_FULL_DETAIL :{SETX 12}Full detail
-STR_02D3_TRANSPARENT_BUILDINGS :{CHECKMARK}{SETX 12}Transparent buildings
STR_02D4_TRANSPARENT_BUILDINGS :{SETX 12}Transparent buildings
-STR_TRANSPARENT_SIGNS_C :{CHECKMARK}{SETX 12}Transparent station signs
STR_TRANSPARENT_SIGNS :{SETX 12}Transparent station signs
############ range ends here
diff --git a/lang/brazilian_portuguese.txt b/lang/brazilian_portuguese.txt
index a4269b7d6..de39b71a5 100644
--- a/lang/brazilian_portuguese.txt
+++ b/lang/brazilian_portuguese.txt
@@ -746,32 +746,20 @@ STR_02C0_SAVE_CUSTOM_NAMES :{BLACK}Gravar n
STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION :{BLACK}Seleção de nomes dos veículos
STR_02C2_SAVE_CUSTOMIZED_VEHICLE :{BLACK}Salvar nomes dos veículos personalizados no disco
+STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_02C3_GAME_OPTIONS :Opções do Jogo
-STR_02C4_GAME_OPTIONS :Opções do Jogo
STR_02C5_DIFFICULTY_SETTINGS :Configurações de dificuldade
-STR_02C6_DIFFICULTY_SETTINGS :Configurações de dificuldade
STR_02C7_CONFIG_PATCHES :Configurar correções
-STR_02C8_CONFIG_PATCHES :Configurar correções
STR_NEWGRF_SETTINGS :Definições Newgrf
-STR_NEWGRF_SETTINGS2 :Definições Newgrf
STR_GAMEOPTMENU_0A :
-STR_GAMEOPTMENU_0B :
-STR_02C9_TOWN_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Mostrar nomes de cidades
STR_02CA_TOWN_NAMES_DISPLAYED :{SETX 12}Mostrar nomes de cidades
-STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Mostrar nomes de estações
STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Mostrar nomes de estações
-STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Mostrar indicações
STR_02CE_SIGNS_DISPLAYED :{SETX 12}Mostrar indicações
-STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Mostrar pontos de controle
STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Mostrar pontos de controle
-STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Animação completa
STR_02D0_FULL_ANIMATION :{SETX 12}Animação completa
-STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Máximo de detalhes
STR_02D2_FULL_DETAIL :{SETX 12}Máximo de detalhes
-STR_02D3_TRANSPARENT_BUILDINGS :{CHECKMARK}{SETX 12}Edifícios transparentes
STR_02D4_TRANSPARENT_BUILDINGS :{SETX 12}Edifícios transparentes
-STR_TRANSPARENT_SIGNS_C :{CHECKMARK}{SETX 12}Nomes de estações transparentes
STR_TRANSPARENT_SIGNS :{SETX 12}Nomes de estações transparentes
############ range ends here
diff --git a/lang/catalan.txt b/lang/catalan.txt
index 60b5de9c0..796eb692a 100644
--- a/lang/catalan.txt
+++ b/lang/catalan.txt
@@ -753,32 +753,20 @@ STR_02C0_SAVE_CUSTOM_NAMES :{BLACK}Desar el
STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION :{BLACK}Selecció de noms de disseny de vehicles
STR_02C2_SAVE_CUSTOMIZED_VEHICLE :{BLACK}Desar noms de disseny de vehicles personalitzats al disc
+STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_02C3_GAME_OPTIONS :Opcions del Joc
-STR_02C4_GAME_OPTIONS :Opcions del Joc
STR_02C5_DIFFICULTY_SETTINGS :Paràmetres de dificultat
-STR_02C6_DIFFICULTY_SETTINGS :Paràmetres de dificultat
STR_02C7_CONFIG_PATCHES :Configurar pegats
-STR_02C8_CONFIG_PATCHES :Configurar pegats
STR_NEWGRF_SETTINGS :Configuracions de Newgrf
-STR_NEWGRF_SETTINGS2 :Configuracions de Newgrf
STR_GAMEOPTMENU_0A :
-STR_GAMEOPTMENU_0B :
-STR_02C9_TOWN_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Mostrar noms de poblacions
STR_02CA_TOWN_NAMES_DISPLAYED :{SETX 12}Mostrar noms de poblacions
-STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Mostrar noms d'estacions
STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Mostrar noms d'estacions
-STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Mostrar senyals
STR_02CE_SIGNS_DISPLAYED :{SETX 12}Mostrar senyals
-STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Mostrar punts de control
STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Mostrar punts de control
-STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Animació completa
STR_02D0_FULL_ANIMATION :{SETX 12}Animació completa
-STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Detall complet
STR_02D2_FULL_DETAIL :{SETX 12}Detall complet
-STR_02D3_TRANSPARENT_BUILDINGS :{CHECKMARK}{SETX 12}Edificis Transparents
STR_02D4_TRANSPARENT_BUILDINGS :{SETX 12}Edificis Transparents
-STR_TRANSPARENT_SIGNS_C :{CHECKMARK}{SETX 12}Signes d'estació transparents
STR_TRANSPARENT_SIGNS :{SETX 12}Signes d'estació transparents
############ range ends here
diff --git a/lang/czech.txt b/lang/czech.txt
index 3ab45eb83..e9b57eaae 100644
--- a/lang/czech.txt
+++ b/lang/czech.txt
@@ -803,32 +803,20 @@ STR_02C0_SAVE_CUSTOM_NAMES :{BLACK}Ulo¸it v
STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION :{BLACK}Vyber nazvu dopravních prostredku
STR_02C2_SAVE_CUSTOMIZED_VEHICLE :{BLACK}Ulo¸it u¸ivatelské názvy dopravních prostredku na disk
+STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_02C3_GAME_OPTIONS :Mo¸nosti hry
-STR_02C4_GAME_OPTIONS :Mo¸nosti hry
STR_02C5_DIFFICULTY_SETTINGS :Nastavení obtí¸nosti
-STR_02C6_DIFFICULTY_SETTINGS :Nastavení obtí¸nosti
STR_02C7_CONFIG_PATCHES :Nastavení patchu
-STR_02C8_CONFIG_PATCHES :Nastavení patchu
STR_NEWGRF_SETTINGS :Nastavení newgrf
-STR_NEWGRF_SETTINGS2 :Nastavení newgrf
STR_GAMEOPTMENU_0A :
-STR_GAMEOPTMENU_0B :
-STR_02C9_TOWN_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Zobrazení jmen mest
STR_02CA_TOWN_NAMES_DISPLAYED :{SETX 12}Zobrazení jmen mest
-STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Zobrazení jmen stanic
STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Zobrazení jmen stanic
-STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Zobrazení popisku
STR_02CE_SIGNS_DISPLAYED :{SETX 12}Zobrazení popisku
-STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Zobrazení kontrolních bodu
STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Zobrazení kontrolních bodu
-STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Plné animace
STR_02D0_FULL_ANIMATION :{SETX 12}Plné animace
-STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Plné detaily
STR_02D2_FULL_DETAIL :{SETX 12}Plné detaily
-STR_02D3_TRANSPARENT_BUILDINGS :{CHECKMARK}{SETX 12}Pruhledne budovy
STR_02D4_TRANSPARENT_BUILDINGS :{SETX 12}Pruhledne budovy
-STR_TRANSPARENT_SIGNS_C :{CHECKMARK}{SETX 12}Pruhledna jména stanic
STR_TRANSPARENT_SIGNS :{SETX 12}Pruhledna jména stanic
############ range ends here
diff --git a/lang/danish.txt b/lang/danish.txt
index 7bfb3dcdb..e8e64d27e 100644
--- a/lang/danish.txt
+++ b/lang/danish.txt
@@ -753,32 +753,20 @@ STR_02C0_SAVE_CUSTOM_NAMES :{BLACK}Gem ikke
STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION :{BLACK}Valg af køretøjsdesignnavne
STR_02C2_SAVE_CUSTOMIZED_VEHICLE :{BLACK}Gem brugerdefinerede køretøjsdesignnavne
+STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_02C3_GAME_OPTIONS :Spilindstillinger
-STR_02C4_GAME_OPTIONS :Spilindstillinger
STR_02C5_DIFFICULTY_SETTINGS :Sværhedsgrad
-STR_02C6_DIFFICULTY_SETTINGS :Sværhedsgrad
STR_02C7_CONFIG_PATCHES :Konfigurér patches
-STR_02C8_CONFIG_PATCHES :Konfigurér patches
STR_NEWGRF_SETTINGS :Newgrf indstillinger
-STR_NEWGRF_SETTINGS2 :Newgrf indstillinger
STR_GAMEOPTMENU_0A :
-STR_GAMEOPTMENU_0B :
-STR_02C9_TOWN_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Bynavne vist
STR_02CA_TOWN_NAMES_DISPLAYED :{SETX 12}Bynavne vist
-STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Stationsnavne vist
STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Stationsnavne vist
-STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Skilte vist
STR_02CE_SIGNS_DISPLAYED :{SETX 12}Skilte vist
-STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Kontrolsteder vist
STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Kontrolsteder vist
-STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Fuld animation
STR_02D0_FULL_ANIMATION :{SETX 12}Fuld animation
-STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Fuld detalje
STR_02D2_FULL_DETAIL :{SETX 12}Fuld detalje
-STR_02D3_TRANSPARENT_BUILDINGS :{CHECKMARK}{SETX 12}Gennemsigtige bygninger
STR_02D4_TRANSPARENT_BUILDINGS :{SETX 12}Gennemsigtige bygninger
-STR_TRANSPARENT_SIGNS_C :{CHECKMARK}{SETX 12}Gennemsigtige station skilte
STR_TRANSPARENT_SIGNS :{SETX 12}Gennemsigtige station skilte
############ range ends here
diff --git a/lang/dutch.txt b/lang/dutch.txt
index 1f4cdd47a..0e8e85e8f 100644
--- a/lang/dutch.txt
+++ b/lang/dutch.txt
@@ -753,32 +753,20 @@ STR_02C0_SAVE_CUSTOM_NAMES :{BLACK}Sla aang
STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION :{BLACK}Keuze van voertuignamen
STR_02C2_SAVE_CUSTOMIZED_VEHICLE :{BLACK}Sla aangepaste voertuignamen op
+STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_02C3_GAME_OPTIONS :Spelopties
-STR_02C4_GAME_OPTIONS :Spelopties
STR_02C5_DIFFICULTY_SETTINGS :Moeilijkheidsgraad
-STR_02C6_DIFFICULTY_SETTINGS :Moeilijkheidsgraad
STR_02C7_CONFIG_PATCHES :Kies patches
-STR_02C8_CONFIG_PATCHES :Kies patches
STR_NEWGRF_SETTINGS :Newgrf instellingen
-STR_NEWGRF_SETTINGS2 :Newgrf instellingen
STR_GAMEOPTMENU_0A :
-STR_GAMEOPTMENU_0B :
-STR_02C9_TOWN_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Geef stadsnamen weer
STR_02CA_TOWN_NAMES_DISPLAYED :{SETX 12}Geef stadsnamen weer
-STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Geef stationsnamen weer
STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Geef stationsnamen weer
-STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Geef borden weer
STR_02CE_SIGNS_DISPLAYED :{SETX 12}Geef borden weer
-STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Geef controleposten weer
STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Controlepost weergegeven
-STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Alle animatie
STR_02D0_FULL_ANIMATION :{SETX 12}Alle animatie
-STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Alle details
STR_02D2_FULL_DETAIL :{SETX 12}Alle details
-STR_02D3_TRANSPARENT_BUILDINGS :{CHECKMARK}{SETX 12}Transparante gebouwen
STR_02D4_TRANSPARENT_BUILDINGS :{SETX 12}Transparante gebouwen
-STR_TRANSPARENT_SIGNS_C :{CHECKMARK}{SETX 12}Transparant station bord
STR_TRANSPARENT_SIGNS :{SETX 12}Transparant station bord
############ range ends here
diff --git a/lang/english.txt b/lang/english.txt
index ecdb73ff4..35d197f62 100644
--- a/lang/english.txt
+++ b/lang/english.txt
@@ -753,32 +753,20 @@ STR_02C0_SAVE_CUSTOM_NAMES :{BLACK}Save cus
STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION :{BLACK}Vehicle design names selection
STR_02C2_SAVE_CUSTOMIZED_VEHICLE :{BLACK}Save customised vehicle design names
+STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_02C3_GAME_OPTIONS :Game options
-STR_02C4_GAME_OPTIONS :Game options
STR_02C5_DIFFICULTY_SETTINGS :Difficulty settings
-STR_02C6_DIFFICULTY_SETTINGS :Difficulty settings
STR_02C7_CONFIG_PATCHES :Configure patches
-STR_02C8_CONFIG_PATCHES :Configure patches
STR_NEWGRF_SETTINGS :Newgrf settings
-STR_NEWGRF_SETTINGS2 :Newgrf settings
STR_GAMEOPTMENU_0A :
-STR_GAMEOPTMENU_0B :
-STR_02C9_TOWN_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Town names displayed
STR_02CA_TOWN_NAMES_DISPLAYED :{SETX 12}Town names displayed
-STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Station names displayed
STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Station names displayed
-STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Signs displayed
STR_02CE_SIGNS_DISPLAYED :{SETX 12}Signs displayed
-STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Waypoints displayed
STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Waypoints displayed
-STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Full animation
STR_02D0_FULL_ANIMATION :{SETX 12}Full animation
-STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Full detail
STR_02D2_FULL_DETAIL :{SETX 12}Full detail
-STR_02D3_TRANSPARENT_BUILDINGS :{CHECKMARK}{SETX 12}Transparent buildings
STR_02D4_TRANSPARENT_BUILDINGS :{SETX 12}Transparent buildings
-STR_TRANSPARENT_SIGNS_C :{CHECKMARK}{SETX 12}Transparent station signs
STR_TRANSPARENT_SIGNS :{SETX 12}Transparent station signs
############ range ends here
@@ -1077,6 +1065,7 @@ STR_CONFIG_PATCHES_STATION_SPREAD :{LTBLUE}Max sta
STR_CONFIG_PATCHES_SERVICEATHELIPAD :{LTBLUE}Service helicopters at helipads automatically: {ORANGE}{STRING1}
STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR :{LTBLUE}Link landscape toolbar to rail/road/water/airport toolbars: {ORANGE}{STRING1}
STR_CONFIG_PATCHES_REVERSE_SCROLLING :{LTBLUE}Reverse scroll direction: {ORANGE}{STRING1}
+STR_CONFIG_PATCHES_MEASURE_TOOLTIP :{LTBLUE}Show a measurement tooltip when using various build-tools: {ORANGE}{STRING1}
STR_CONFIG_PATCHES_LIVERIES :{LTBLUE}Show company liveries: {ORANGE}{STRING1}
STR_CONFIG_PATCHES_LIVERIES_NONE :None
STR_CONFIG_PATCHES_LIVERIES_OWN :Own company
@@ -3104,4 +3093,12 @@ STR_SMALL_AIRPORTS :{BLACK}Small ai
STR_LARGE_AIRPORTS :{BLACK}Large airports
STR_HUB_AIRPORTS :{BLACK}Hub airports
STR_HELIPORTS :{BLACK}Helicopter airports
+
+############ Tooltip measurment
+
+STR_MEASURE_LENGTH :{BLACK}Length: {NUM}
+STR_MEASURE_AREA :{BLACK}Area: {NUM} x {NUM}
+STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Length: {NUM}{}Height difference: {NUM} m
+STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Area: {NUM} x {NUM}{}Height difference: {NUM} m
+
########
diff --git a/lang/estonian.txt b/lang/estonian.txt
index 6704900f8..0fe007dc2 100644
--- a/lang/estonian.txt
+++ b/lang/estonian.txt
@@ -749,32 +749,20 @@ STR_02C0_SAVE_CUSTOM_NAMES :{BLACK}Salvesta
STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION :{BLACK}Sõidukite disaininimede valik
STR_02C2_SAVE_CUSTOMIZED_VEHICLE :{BLACK}Salvesta omatehtud disaininimed
+STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_02C3_GAME_OPTIONS :Mängu seaded
-STR_02C4_GAME_OPTIONS :Mängu seaded
STR_02C5_DIFFICULTY_SETTINGS :Raskusastme seaded
-STR_02C6_DIFFICULTY_SETTINGS :Raskusastme seaded
STR_02C7_CONFIG_PATCHES :Paranduste seaded
-STR_02C8_CONFIG_PATCHES :Paranduste seaded
STR_NEWGRF_SETTINGS :Newgrf seaded
-STR_NEWGRF_SETTINGS2 :Newgrf seaded
STR_GAMEOPTMENU_0A :
-STR_GAMEOPTMENU_0B :
-STR_02C9_TOWN_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Linnade nimede näitamine
STR_02CA_TOWN_NAMES_DISPLAYED :{SETX 12}Linnade nimede näitamine
-STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Jaamade nimede näitamine
STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Jaamade nimede näitamine
-STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Siltide näitamine
STR_02CE_SIGNS_DISPLAYED :{SETX 12}Siltide näitamine
-STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Näidatud kontrollpunktid
STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Näidatud kontrollpunktid
-STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Täielik animeerimine
STR_02D0_FULL_ANIMATION :{SETX 12}Täielik animeerimine
-STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Kõik detailid
STR_02D2_FULL_DETAIL :{SETX 12}Kõik detailid
-STR_02D3_TRANSPARENT_BUILDINGS :{CHECKMARK}{SETX 12}Läbipaistvad hooned
STR_02D4_TRANSPARENT_BUILDINGS :{SETX 12}Läbipaistvad hooned
-STR_TRANSPARENT_SIGNS_C :{CHECKMARK}{SETX 12}Läbinähtavad jaama nimesildid
STR_TRANSPARENT_SIGNS :{SETX 12}Läbinähtavad jaama nimesildid
############ range ends here
diff --git a/lang/finnish.txt b/lang/finnish.txt
index 2857dd3a9..fffa1d5ea 100644
--- a/lang/finnish.txt
+++ b/lang/finnish.txt
@@ -753,32 +753,20 @@ STR_02C0_SAVE_CUSTOM_NAMES :{BLACK}Tallenna
STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION :{BLACK}Liikennevälineiden mallinimien valinta.
STR_02C2_SAVE_CUSTOMIZED_VEHICLE :{BLACK}Tallenna omat liikennevälineiden mallien nimet levylle.
+STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_02C3_GAME_OPTIONS :Pelin asetukset
-STR_02C4_GAME_OPTIONS :Pelin asetukset
STR_02C5_DIFFICULTY_SETTINGS :Vaikeusasetukset
-STR_02C6_DIFFICULTY_SETTINGS :Vaikeusasetukset
STR_02C7_CONFIG_PATCHES :Muokkaa paikkauksia
-STR_02C8_CONFIG_PATCHES :Muokkaa paikkauksia
STR_NEWGRF_SETTINGS :Newgrf-asetukset
-STR_NEWGRF_SETTINGS2 :Newgrf-asetukset
STR_GAMEOPTMENU_0A :
-STR_GAMEOPTMENU_0B :
-STR_02C9_TOWN_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Kaupunkien nimet näkyvissä
STR_02CA_TOWN_NAMES_DISPLAYED :{SETX 12}Kaupunkien nimet näkyvissä
-STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Asemien nimet näkyvissä
STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Asemien nimet näkyvissä
-STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Kyltit näkyvissä
STR_02CE_SIGNS_DISPLAYED :{SETX 12}Kyltit näkyvissä
-STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Rastit näkyvissä
STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Rastit näkyvissä
-STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Täysi animointi
STR_02D0_FULL_ANIMATION :{SETX 12}Täysi animointi
-STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Kaikki yksityiskohdat
STR_02D2_FULL_DETAIL :{SETX 12}Kaikki yksityiskohdat
-STR_02D3_TRANSPARENT_BUILDINGS :{CHECKMARK}{SETX 12}Läpinäkyvät rakennukset
STR_02D4_TRANSPARENT_BUILDINGS :{SETX 12}Läpinäkyvät rakennukset
-STR_TRANSPARENT_SIGNS_C :{CHECKMARK}{SETX 12}Läpinäkyvät asemakyltit
STR_TRANSPARENT_SIGNS :{SETX 12}Läpinäkyvät asemakyltit
############ range ends here
diff --git a/lang/french.txt b/lang/french.txt
index f9f3f7730..78e5124fe 100644
--- a/lang/french.txt
+++ b/lang/french.txt
@@ -754,32 +754,20 @@ STR_02C0_SAVE_CUSTOM_NAMES :{BLACK}Sauver l
STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION :{BLACK}Sélection des noms de conception de véhicule
STR_02C2_SAVE_CUSTOMIZED_VEHICLE :{BLACK}Sauvegarder noms personnalisés de conception de véhicule
+STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_02C3_GAME_OPTIONS :Options du Jeu
-STR_02C4_GAME_OPTIONS :Options du Jeu
STR_02C5_DIFFICULTY_SETTINGS :Niveau de Difficulté
-STR_02C6_DIFFICULTY_SETTINGS :Niveau de Difficulté
STR_02C7_CONFIG_PATCHES :Configuration Avancée
-STR_02C8_CONFIG_PATCHES :Configuration Avancée
STR_NEWGRF_SETTINGS :Paramètres Newgrf
-STR_NEWGRF_SETTINGS2 :Paramètres Newgrf
STR_GAMEOPTMENU_0A :
-STR_GAMEOPTMENU_0B :
-STR_02C9_TOWN_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Afficher le nom des villes
STR_02CA_TOWN_NAMES_DISPLAYED :{SETX 12}Afficher le nom des villes
-STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Afficher le nom des stations
STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Afficher le nom des stations
-STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Afficher les panneaux
STR_02CE_SIGNS_DISPLAYED :{SETX 12}Afficher les panneaux
-STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Afficher les pts de contrôle
STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Afficher les pts de contrôle
-STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Animation complète
STR_02D0_FULL_ANIMATION :{SETX 12}Animation complète
-STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Détail Maximal
STR_02D2_FULL_DETAIL :{SETX 12}Détails maximums
-STR_02D3_TRANSPARENT_BUILDINGS :{CHECKMARK}{SETX 12}Édifices transparents
STR_02D4_TRANSPARENT_BUILDINGS :{SETX 12}Édifices transparents
-STR_TRANSPARENT_SIGNS_C :{CHECKMARK}{SETX 12}Nom de station transparent
STR_TRANSPARENT_SIGNS :{SETX 12}Nom de station transparent
############ range ends here
diff --git a/lang/galician.txt b/lang/galician.txt
index da07faa88..d3619bc15 100644
--- a/lang/galician.txt
+++ b/lang/galician.txt
@@ -734,32 +734,20 @@ STR_02C0_SAVE_CUSTOM_NAMES :{BLACK}Graba-lo
STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION :{BLACK}Selección de nomes dos deseños dos vehículos
STR_02C2_SAVE_CUSTOMIZED_VEHICLE :{BLACK}Graba-los nomes dos deseños dos vehículos persoalizados no disco
+STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_02C3_GAME_OPTIONS :Opcións da Partida
-STR_02C4_GAME_OPTIONS :Opcións da Partida
STR_02C5_DIFFICULTY_SETTINGS :Configuración de Dificultade
-STR_02C6_DIFFICULTY_SETTINGS :Configuración de Dificultade
STR_02C7_CONFIG_PATCHES :Configuración dos Parches
-STR_02C8_CONFIG_PATCHES :Configurar parches
STR_NEWGRF_SETTINGS :Configuración de Newgrf
-STR_NEWGRF_SETTINGS2 :Configuración de Newgrf
STR_GAMEOPTMENU_0A :
-STR_GAMEOPTMENU_0B :
-STR_02C9_TOWN_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Amosar nomes de cidades
STR_02CA_TOWN_NAMES_DISPLAYED :{SETX 12}Amosar nomes de cidades
-STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Amosar nomes de estacións
STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Amosae nomes de estacións
-STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Amosa-los sinais
STR_02CE_SIGNS_DISPLAYED :{SETX 12}Amosa-los sinais
-STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Amosar puntos de control
STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Amosar puntos de control
-STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Animacións completas
STR_02D0_FULL_ANIMATION :{SETX 12}Animación completa
-STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Detalle completo
STR_02D2_FULL_DETAIL :{SETX 12}Detalle completo
-STR_02D3_TRANSPARENT_BUILDINGS :{CHECKMARK}{SETX 12}Edificios transparentes
STR_02D4_TRANSPARENT_BUILDINGS :{SETX 12}Edificios transparentes
-STR_TRANSPARENT_SIGNS_C :{CHECKMARK}{SETX 12}Sinais de estación transparentes
STR_TRANSPARENT_SIGNS :{SETX 12}Sinais de estación transparentes
############ range ends here
diff --git a/lang/german.txt b/lang/german.txt
index cf7d799bf..8c67bd744 100644
--- a/lang/german.txt
+++ b/lang/german.txt
@@ -753,32 +753,20 @@ STR_02C0_SAVE_CUSTOM_NAMES :{BLACK}Angepass
STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION :{BLACK}Auswahl der Fahrzeugnamen
STR_02C2_SAVE_CUSTOMIZED_VEHICLE :{BLACK}Eigene Namen abspeichern
+STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_02C3_GAME_OPTIONS :Spieleinstellungen
-STR_02C4_GAME_OPTIONS :Spieleinstellungen
STR_02C5_DIFFICULTY_SETTINGS :Schwierigkeitsgrad
-STR_02C6_DIFFICULTY_SETTINGS :Schwierigkeitsgrad
STR_02C7_CONFIG_PATCHES :Einstellungen der Patches
-STR_02C8_CONFIG_PATCHES :Einstellungen der Patches
STR_NEWGRF_SETTINGS :Newgrf-Einstellungen
-STR_NEWGRF_SETTINGS2 :Newgrf-Einstellungen
STR_GAMEOPTMENU_0A :
-STR_GAMEOPTMENU_0B :
-STR_02C9_TOWN_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Städtenamen anzeigen
STR_02CA_TOWN_NAMES_DISPLAYED :{SETX 12}Städtenamen anzeigen
-STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Stationsnamen anzeigen
STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Stationsnamen anzeigen
-STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Schilder anzeigen
STR_02CE_SIGNS_DISPLAYED :{SETX 12}Schilder anzeigen
-STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Wegpunkte anzeigen
STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Wegpunkte anzeigen
-STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Vollständige Animation
STR_02D0_FULL_ANIMATION :{SETX 12}Vollständige Animation
-STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Vollständige Detailansicht
STR_02D2_FULL_DETAIL :{SETX 12}Vollständige Detailansicht
-STR_02D3_TRANSPARENT_BUILDINGS :{CHECKMARK}{SETX 12}Durchsichtige Gebäude
STR_02D4_TRANSPARENT_BUILDINGS :{SETX 12}Durchsichtige Gebäude
-STR_TRANSPARENT_SIGNS_C :{CHECKMARK}{SETX 12}Durchsichtige Stationsnamen
STR_TRANSPARENT_SIGNS :{SETX 12}Durchsichtige Stationsnamen
############ range ends here
diff --git a/lang/hungarian.txt b/lang/hungarian.txt
index a54cda8bc..008cb59d3 100644
--- a/lang/hungarian.txt
+++ b/lang/hungarian.txt
@@ -818,32 +818,20 @@ STR_02C0_SAVE_CUSTOM_NAMES :{BLACK}Saját ne
STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION :{BLACK}A jármûvek márkanevének kiválasztása
STR_02C2_SAVE_CUSTOMIZED_VEHICLE :{BLACK}A saját jármû-márkanevek elmentése lemezre
+STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_02C3_GAME_OPTIONS :Beállítások
-STR_02C4_GAME_OPTIONS :Beállítások
STR_02C5_DIFFICULTY_SETTINGS :Nehézségi beállítások
-STR_02C6_DIFFICULTY_SETTINGS :Nehézségi beállítások
STR_02C7_CONFIG_PATCHES :Foltok beállítása
-STR_02C8_CONFIG_PATCHES :Foltok beállítása
STR_NEWGRF_SETTINGS :Newgrf beállítások
-STR_NEWGRF_SETTINGS2 :Newgrf beállítások
STR_GAMEOPTMENU_0A :
-STR_GAMEOPTMENU_0B :
-STR_02C9_TOWN_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Városnevek mutatása
STR_02CA_TOWN_NAMES_DISPLAYED :{SETX 12}Városnevek mutatása
-STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Állomásnevek mutatása
STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Állomásnevek mutatása
-STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Feliratok mutatása
STR_02CE_SIGNS_DISPLAYED :{SETX 12}Feliratok mutatása
-STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Ellenõrzõ pontok mutatása
STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Ellenõrzõ pontok mutatása
-STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Teljes animáció
STR_02D0_FULL_ANIMATION :{SETX 12}Teljes animáció
-STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Minden részlet
STR_02D2_FULL_DETAIL :{SETX 12}Minden részlet
-STR_02D3_TRANSPARENT_BUILDINGS :{CHECKMARK}{SETX 12}Átlátszó épületek
STR_02D4_TRANSPARENT_BUILDINGS :{SETX 12}Átlátszó épületek
-STR_TRANSPARENT_SIGNS_C :{CHECKMARK}{SETX 12}Állomásnevek keret nélkül
STR_TRANSPARENT_SIGNS :{SETX 12}Állomásnevek keret nélkül
############ range ends here
diff --git a/lang/icelandic.txt b/lang/icelandic.txt
index d972b4461..805864905 100644
--- a/lang/icelandic.txt
+++ b/lang/icelandic.txt
@@ -743,32 +743,20 @@ STR_02C0_SAVE_CUSTOM_NAMES :{BLACK}Geyma br
STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION :{BLACK}Nöfn farartækja
STR_02C2_SAVE_CUSTOMIZED_VEHICLE :{BLACK}Vista breytt tegundanöfn farartækja
+STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_02C3_GAME_OPTIONS :Stillingar
-STR_02C4_GAME_OPTIONS :Stillingar
STR_02C5_DIFFICULTY_SETTINGS :Erfiðleikastig
-STR_02C6_DIFFICULTY_SETTINGS :Erfiðleikastig
STR_02C7_CONFIG_PATCHES :Viðbætur
-STR_02C8_CONFIG_PATCHES :Viðbætur
STR_NEWGRF_SETTINGS :Nýgrf stillingar
-STR_NEWGRF_SETTINGS2 :Nýgrf stillingar
STR_GAMEOPTMENU_0A :
-STR_GAMEOPTMENU_0B :
-STR_02C9_TOWN_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Bæjarnöfn sýnd
STR_02CA_TOWN_NAMES_DISPLAYED :{SETX 12}Bæjarnöfn sýnd
-STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Stöðvarnöfn sýnd
STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Stöðvarnöfn sýnd
-STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Skilti sýnd
STR_02CE_SIGNS_DISPLAYED :{SETX 12}Skilti sýnd
-STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Millistöðvar sýndar
STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Millistöðvar sýndar
-STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Fullar myndhreyfingar
STR_02D0_FULL_ANIMATION :{SETX 12}Fullar myndhreyfingar
-STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Full nákvæmni
STR_02D2_FULL_DETAIL :{SETX 12}Full nákvæmni
-STR_02D3_TRANSPARENT_BUILDINGS :{CHECKMARK}{SETX 12}Gegnsæjar byggingar
STR_02D4_TRANSPARENT_BUILDINGS :{SETX 12}Gegnsæjar byggingar
-STR_TRANSPARENT_SIGNS_C :{CHECKMARK}{SETX 12}Gegnsæ stöðvanöfn
STR_TRANSPARENT_SIGNS :{SETX 12}Gegnsæ stöðvanöfn
############ range ends here
diff --git a/lang/italian.txt b/lang/italian.txt
index 4f6982f9f..a67e1b01a 100644
--- a/lang/italian.txt
+++ b/lang/italian.txt
@@ -753,32 +753,20 @@ STR_02C0_SAVE_CUSTOM_NAMES :{BLACK}Salva i
STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION :{BLACK}Selezione nomi personalizzati
STR_02C2_SAVE_CUSTOMIZED_VEHICLE :{BLACK}Salva nomi personalizzati dei veicoli
+STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_02C3_GAME_OPTIONS :Opzioni gioco
-STR_02C4_GAME_OPTIONS :Opzioni gioco
STR_02C5_DIFFICULTY_SETTINGS :Impostazioni difficoltà
-STR_02C6_DIFFICULTY_SETTINGS :Impostazioni difficoltà
STR_02C7_CONFIG_PATCHES :Configura patch
-STR_02C8_CONFIG_PATCHES :Configura patch
STR_NEWGRF_SETTINGS :Impostazioni Newgrf
-STR_NEWGRF_SETTINGS2 :Impostazioni Newgrf
STR_GAMEOPTMENU_0A :
-STR_GAMEOPTMENU_0B :
-STR_02C9_TOWN_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Mostra nomi città
STR_02CA_TOWN_NAMES_DISPLAYED :{SETX 12}Mostra nomi città
-STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Mostra nomi stazioni
STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Mostra nomi stazioni
-STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Mostra cartelli
STR_02CE_SIGNS_DISPLAYED :{SETX 12}Mostra cartelli
-STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Waypoints mostrati
STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Waypoints mostrati
-STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Animazione completa
STR_02D0_FULL_ANIMATION :{SETX 12}Animazione completa
-STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Massimo dettaglio
STR_02D2_FULL_DETAIL :{SETX 12}Massimo dettaglio
-STR_02D3_TRANSPARENT_BUILDINGS :{CHECKMARK}{SETX 12}Edifici trasparenti
STR_02D4_TRANSPARENT_BUILDINGS :{SETX 12}Edifici trasparenti
-STR_TRANSPARENT_SIGNS_C :{CHECKMARK}{SETX 12}Nomi stazioni trasparenti
STR_TRANSPARENT_SIGNS :{SETX 12}Nomi stazioni trasparenti
############ range ends here
diff --git a/lang/norwegian.txt b/lang/norwegian.txt
index 409e6af55..f3be65a96 100644
--- a/lang/norwegian.txt
+++ b/lang/norwegian.txt
@@ -746,32 +746,20 @@ STR_02C0_SAVE_CUSTOM_NAMES :{BLACK}Lagre eg
STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION :{BLACK}Velg navn på kjøretøy
STR_02C2_SAVE_CUSTOMIZED_VEHICLE :{BLACK}Lagre egendefinerte navn på kjøretøy
+STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_02C3_GAME_OPTIONS :Spillinnstillinger
-STR_02C4_GAME_OPTIONS :Spillinnstillinger
STR_02C5_DIFFICULTY_SETTINGS :Vanskelighetsgrad
-STR_02C6_DIFFICULTY_SETTINGS :Vanskelighetsgrad
STR_02C7_CONFIG_PATCHES :Konfigurer patcher
-STR_02C8_CONFIG_PATCHES :Konfigurer patcher
STR_NEWGRF_SETTINGS :Innstillinger for ny grafikk
-STR_NEWGRF_SETTINGS2 :Innstillinger for ny grafikk
STR_GAMEOPTMENU_0A :
-STR_GAMEOPTMENU_0B :
-STR_02C9_TOWN_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Vis bynavn
STR_02CA_TOWN_NAMES_DISPLAYED :{SETX 12}Vis bynavn
-STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Vis stasjonsnavn
STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Vis stasjonsnavn
-STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Vis skilt
STR_02CE_SIGNS_DISPLAYED :{SETX 12}Vis skilt
-STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Vis kontrollpunkt
STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Vis kontrollpunkt
-STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Fullstending animasjon
STR_02D0_FULL_ANIMATION :{SETX 12}Fullstending animasjon
-STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Maksimalt med detaljer
STR_02D2_FULL_DETAIL :{SETX 12}Maksimalt med detaljer
-STR_02D3_TRANSPARENT_BUILDINGS :{CHECKMARK}{SETX 12}Gjennomsiktige bygninger
STR_02D4_TRANSPARENT_BUILDINGS :{SETX 12}Gjennomsiktige bygninger
-STR_TRANSPARENT_SIGNS_C :{CHECKMARK}{SETX 12}Gjennomsiktige stasjonsnavn
STR_TRANSPARENT_SIGNS :{SETX 12}Gjennomsiktige stasjonsnavn
############ range ends here
diff --git a/lang/polish.txt b/lang/polish.txt
index d1947e279..3288bc197 100644
--- a/lang/polish.txt
+++ b/lang/polish.txt
@@ -840,32 +840,20 @@ STR_02C0_SAVE_CUSTOM_NAMES :{BLACK}Zapisz w
STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION :{BLACK}Wybor nazw pojazdow
STR_02C2_SAVE_CUSTOMIZED_VEHICLE :{BLACK}Zapisz niestandardowe nazwy pojazdow na dysk
+STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_02C3_GAME_OPTIONS :Opcje gry
-STR_02C4_GAME_OPTIONS :Opcje gry
STR_02C5_DIFFICULTY_SETTINGS :Ustawienia trudnosci
-STR_02C6_DIFFICULTY_SETTINGS :Ustawienia trudnosci
STR_02C7_CONFIG_PATCHES :Konfiguracja wtyczek
-STR_02C8_CONFIG_PATCHES :Konfiguracja wtyczek
STR_NEWGRF_SETTINGS :Ustawienia newgrf
-STR_NEWGRF_SETTINGS2 :Ustawienia newgrf
STR_GAMEOPTMENU_0A :
-STR_GAMEOPTMENU_0B :
-STR_02C9_TOWN_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Wyswietlanie nazw miast
STR_02CA_TOWN_NAMES_DISPLAYED :{SETX 12}Wyswietlanie nazw miast
-STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Wyswietlanie nazw stacji
STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Wyswietlanie nazw stacji
-STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Wyswietlanie znakow
STR_02CE_SIGNS_DISPLAYED :{SETX 12}Wyswietlanie znakow
-STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Wyswietlanie punktow kontrolnych
STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Wyswietlanie punktow kontrolnych
-STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Pelna animacja
STR_02D0_FULL_ANIMATION :{SETX 12}Pelna animacja
-STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Wszystkie detale
STR_02D2_FULL_DETAIL :{SETX 12}Wszystkie detale
-STR_02D3_TRANSPARENT_BUILDINGS :{CHECKMARK}{SETX 12}Przezroczyste budynki
STR_02D4_TRANSPARENT_BUILDINGS :{SETX 12}Przezroczyste budynki
-STR_TRANSPARENT_SIGNS_C :{CHECKMARK}{SETX 12}Przezroczyste nazwy stacji
STR_TRANSPARENT_SIGNS :{SETX 12}Przezroczyste nazwy stacji
############ range ends here
diff --git a/lang/portuguese.txt b/lang/portuguese.txt
index b58f3e32b..bd1e91d7a 100644
--- a/lang/portuguese.txt
+++ b/lang/portuguese.txt
@@ -746,32 +746,20 @@ STR_02C0_SAVE_CUSTOM_NAMES :{BLACK}Gravar n
STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION :{BLACK}Selecção de nomes dos veículos
STR_02C2_SAVE_CUSTOMIZED_VEHICLE :{BLACK}Guardar nomes dos veículos personalizados no disco
+STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_02C3_GAME_OPTIONS :Opções do Jogo
-STR_02C4_GAME_OPTIONS :Opções do Jogo
STR_02C5_DIFFICULTY_SETTINGS :Configurações de dificuldade
-STR_02C6_DIFFICULTY_SETTINGS :Configurações de dificuldade
STR_02C7_CONFIG_PATCHES :Configurar correcções
-STR_02C8_CONFIG_PATCHES :Configurar correcções
STR_NEWGRF_SETTINGS :Definições Newgrf
-STR_NEWGRF_SETTINGS2 :Definições Newgrf
STR_GAMEOPTMENU_0A :
-STR_GAMEOPTMENU_0B :
-STR_02C9_TOWN_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Mostrar nomes de cidades
STR_02CA_TOWN_NAMES_DISPLAYED :{SETX 12}Mostrar nomes de cidades
-STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Mostrar nomes de estações
STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Mostrar nomes de estações
-STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Mostrar indicações
STR_02CE_SIGNS_DISPLAYED :{SETX 12}Mostrar indicações
-STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Mostrar pontos de passagem
STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Mostrar pontos de passagem
-STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Animação completa
STR_02D0_FULL_ANIMATION :{SETX 12}Animação completa
-STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Máximo de detalhes
STR_02D2_FULL_DETAIL :{SETX 12}Máximo de detalhes
-STR_02D3_TRANSPARENT_BUILDINGS :{CHECKMARK}{SETX 12}Edifícios transparentes
STR_02D4_TRANSPARENT_BUILDINGS :{SETX 12}Edifícios transparentes
-STR_TRANSPARENT_SIGNS_C :{CHECKMARK}{SETX 12}Sinais transparentes nas estações
STR_TRANSPARENT_SIGNS :{SETX 12}Sinais transparentes nas estações
############ range ends here
diff --git a/lang/romanian.txt b/lang/romanian.txt
index 54c367f7a..ffeb7551c 100644
--- a/lang/romanian.txt
+++ b/lang/romanian.txt
@@ -743,32 +743,20 @@ STR_02C0_SAVE_CUSTOM_NAMES :{BLACK}Salveaza
STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION :{BLACK}Selecteazã numele modelelor
STR_02C2_SAVE_CUSTOMIZED_VEHICLE :{BLACK}Salveazã pe disc numele personalizate de mãrci si modele
+STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_02C3_GAME_OPTIONS :Optiunile jocului (F2)
-STR_02C4_GAME_OPTIONS :Optiunile jocului (F2)
STR_02C5_DIFFICULTY_SETTINGS :Setãri dificultate
-STR_02C6_DIFFICULTY_SETTINGS :Setãri dificultate
STR_02C7_CONFIG_PATCHES :Configurare patch
-STR_02C8_CONFIG_PATCHES :Configurare patch
STR_NEWGRF_SETTINGS :Setari Newgrf
-STR_NEWGRF_SETTINGS2 :Setari Newgrf
STR_GAMEOPTMENU_0A :
-STR_GAMEOPTMENU_0B :
-STR_02C9_TOWN_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Afiseazã numele oraselor
STR_02CA_TOWN_NAMES_DISPLAYED :{SETX 12}Afiseazã numele oraselor
-STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Afiseazã numele statiilor
STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Afiseazã numele statiilor
-STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Afiseazã semnele de pe hartã
STR_02CE_SIGNS_DISPLAYED :{SETX 12}Afiseazã semnele de pe hartã
-STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Afisare puncte de tranzit
STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Afisare puncte de tranzit
-STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Animatie completã
STR_02D0_FULL_ANIMATION :{SETX 12}Animatie completã
-STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Detalii grafice complete
STR_02D2_FULL_DETAIL :{SETX 12}Detalii grafice complete
-STR_02D3_TRANSPARENT_BUILDINGS :{CHECKMARK}{SETX 12}Clãdiri transparente (X)
STR_02D4_TRANSPARENT_BUILDINGS :{SETX 12}Peisaj transparent (X)
-STR_TRANSPARENT_SIGNS_C :{CHECKMARK}{SETX 12}Numele statiilor transparente
STR_TRANSPARENT_SIGNS :{SETX 12}Numele statiilor transparente
############ range ends here
diff --git a/lang/slovak.txt b/lang/slovak.txt
index 980536847..8cce86299 100644
--- a/lang/slovak.txt
+++ b/lang/slovak.txt
@@ -816,32 +816,20 @@ STR_02C0_SAVE_CUSTOM_NAMES :{BLACK}Ulozit v
STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION :{BLACK}Vyber nazvu vozidiel
STR_02C2_SAVE_CUSTOMIZED_VEHICLE :{BLACK}Ulozit vlastne nazvy vozidiel na disk
+STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_02C3_GAME_OPTIONS :Nastavenia hry
-STR_02C4_GAME_OPTIONS :Nastavenia hry
STR_02C5_DIFFICULTY_SETTINGS :Nastavenia obtiaznosti
-STR_02C6_DIFFICULTY_SETTINGS :Nastavenia obtiaznosti
STR_02C7_CONFIG_PATCHES :Nastavenia patchov
-STR_02C8_CONFIG_PATCHES :Nastavenia patchov
STR_NEWGRF_SETTINGS :Nastavenie newgrf
-STR_NEWGRF_SETTINGS2 :Nastavenie newgrf
STR_GAMEOPTMENU_0A :
-STR_GAMEOPTMENU_0B :
-STR_02C9_TOWN_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Zobrazit nazvy miest
STR_02CA_TOWN_NAMES_DISPLAYED :{SETX 12}Zobrazit nazvy miest
-STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Zobrazit nazvy stanic
STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Zobrazit nazvy stanic
-STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Zobrazit popisy
STR_02CE_SIGNS_DISPLAYED :{SETX 12}Zobrazit popisy
-STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Zobrazit navigacne body
STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Zobrazit navigacne body
-STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Plna animacia
STR_02D0_FULL_ANIMATION :{SETX 12}Plna animacia
-STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Plne detaily
STR_02D2_FULL_DETAIL :{SETX 12}Plne detaily
-STR_02D3_TRANSPARENT_BUILDINGS :{CHECKMARK}{SETX 12}Priesvitne budovy
STR_02D4_TRANSPARENT_BUILDINGS :{SETX 12}Priesvitne budovy
-STR_TRANSPARENT_SIGNS_C :{CHECKMARK}{SETX 12}Transparentne nazvy stanic
STR_TRANSPARENT_SIGNS :{SETX 12}Transparentne nazvy stanic
############ range ends here
diff --git a/lang/spanish.txt b/lang/spanish.txt
index 2edc6f7ac..367569030 100644
--- a/lang/spanish.txt
+++ b/lang/spanish.txt
@@ -754,32 +754,20 @@ STR_02C0_SAVE_CUSTOM_NAMES :{BLACK}Guardar
STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION :{BLACK}Selección de nombres de diseño de vehículos
STR_02C2_SAVE_CUSTOMIZED_VEHICLE :{BLACK}Guardar nombres personalizados en disco
+STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_02C3_GAME_OPTIONS :Opciones de juego
-STR_02C4_GAME_OPTIONS :Opciones de juego
STR_02C5_DIFFICULTY_SETTINGS :Configuración de dificultad
-STR_02C6_DIFFICULTY_SETTINGS :Configuración de dificultad
STR_02C7_CONFIG_PATCHES :Configurar parches
-STR_02C8_CONFIG_PATCHES :Configurar parches
STR_NEWGRF_SETTINGS :Configuración Newgrf
-STR_NEWGRF_SETTINGS2 :Configuración Newgrf
STR_GAMEOPTMENU_0A :
-STR_GAMEOPTMENU_0B :
-STR_02C9_TOWN_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Ver nombres de poblaciones
STR_02CA_TOWN_NAMES_DISPLAYED :{SETX 12}Ver nombres de poblaciones
-STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Ver nombres de estaciones
STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Ver nombres de estaciones
-STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Ver señales
STR_02CE_SIGNS_DISPLAYED :{SETX 12}Ver señales
-STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Ver puntos de comprobación
STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Ver puntos de comprobación
-STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Animación completa
STR_02D0_FULL_ANIMATION :{SETX 12}Animación completa
-STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Detalle completo
STR_02D2_FULL_DETAIL :{SETX 12}Detalle completo
-STR_02D3_TRANSPARENT_BUILDINGS :{CHECKMARK}{SETX 12}Edificios transparentes
STR_02D4_TRANSPARENT_BUILDINGS :{SETX 12}Edificios transparentes
-STR_TRANSPARENT_SIGNS_C :{CHECKMARK}{SETX 12}Señales transparentes
STR_TRANSPARENT_SIGNS :{SETX 12}Señales transparentes
############ range ends here
diff --git a/lang/swedish.txt b/lang/swedish.txt
index e7c3c8466..dd1749862 100644
--- a/lang/swedish.txt
+++ b/lang/swedish.txt
@@ -753,32 +753,20 @@ STR_02C0_SAVE_CUSTOM_NAMES :{BLACK}Spara eg
STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION :{BLACK}Fordonens modellnamnssortiment
STR_02C2_SAVE_CUSTOMIZED_VEHICLE :{BLACK}Spara egna modellnamn för fordon till disk
+STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_02C3_GAME_OPTIONS :Spelinställningar
-STR_02C4_GAME_OPTIONS :Spelinställningar
STR_02C5_DIFFICULTY_SETTINGS :Svårighetsgrad
-STR_02C6_DIFFICULTY_SETTINGS :Svårighetsgrad
STR_02C7_CONFIG_PATCHES :Konfigurera patchar
-STR_02C8_CONFIG_PATCHES :Konfigurera patchar
STR_NEWGRF_SETTINGS :Newgrf inställningar
-STR_NEWGRF_SETTINGS2 :Newgrf inställningar
STR_GAMEOPTMENU_0A :
-STR_GAMEOPTMENU_0B :
-STR_02C9_TOWN_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Stadsnamn visas
STR_02CA_TOWN_NAMES_DISPLAYED :{SETX 12}Stadsnamn visas
-STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Stationsnamn visas
STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Stationsnamn visas
-STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Skyltar visas
STR_02CE_SIGNS_DISPLAYED :{SETX 12}Skyltar visas
-STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Kontrollstationer visas
STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Kontrollstationer visas
-STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Full animation
STR_02D0_FULL_ANIMATION :{SETX 12}Full animation
-STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Full detaljnivå
STR_02D2_FULL_DETAIL :{SETX 12}Full detaljnivå
-STR_02D3_TRANSPARENT_BUILDINGS :{CHECKMARK}{SETX 12}Genomskinliga byggnader
STR_02D4_TRANSPARENT_BUILDINGS :{SETX 12}Genomskinliga byggnader
-STR_TRANSPARENT_SIGNS_C :{CHECKMARK}{SETX 12}Genomskinliga stationsskyltar
STR_TRANSPARENT_SIGNS :{SETX 12}Genomskinliga stationsskyltar
############ range ends here
diff --git a/lang/turkish.txt b/lang/turkish.txt
index ae6100c15..0b422c615 100644
--- a/lang/turkish.txt
+++ b/lang/turkish.txt
@@ -746,32 +746,20 @@ STR_02C0_SAVE_CUSTOM_NAMES :{BLACK}Özel isi
STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION :{BLACK}Araç isimleri seçimi
STR_02C2_SAVE_CUSTOMIZED_VEHICLE :{BLACK}Özellestirilmis araç isimlerini kaydet
+STR_CHECKMARK :{CHECKMARK}
############ range for menu starts
STR_02C3_GAME_OPTIONS :Seçenekler
-STR_02C4_GAME_OPTIONS :Seçenekler
STR_02C5_DIFFICULTY_SETTINGS :Zorluk Ayarlari
-STR_02C6_DIFFICULTY_SETTINGS :Zorluk Ayarlari
STR_02C7_CONFIG_PATCHES :Yamalari Düzenle
-STR_02C8_CONFIG_PATCHES :Yamalari Düzenle
STR_NEWGRF_SETTINGS :Newgrf ayarlari
-STR_NEWGRF_SETTINGS2 :Newgrf ayarlari
STR_GAMEOPTMENU_0A :
-STR_GAMEOPTMENU_0B :
-STR_02C9_TOWN_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Sehir isimlerini göster
STR_02CA_TOWN_NAMES_DISPLAYED :{SETX 12}Sehir isimlerini göster
-STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}istasyon isimlerini göster
STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}istasyon isimlerini göster
-STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Tabelalari göster
STR_02CE_SIGNS_DISPLAYED :{SETX 12}Tabelalari göster
-STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Yolimlerini göster
STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Yolimlerini göster
-STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Tam hareketli
STR_02D0_FULL_ANIMATION :{SETX 12}Tam hareketli
-STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Tam detay
STR_02D2_FULL_DETAIL :{SETX 12}Tam detay
-STR_02D3_TRANSPARENT_BUILDINGS :{CHECKMARK}{SETX 12}Transparan binalar
STR_02D4_TRANSPARENT_BUILDINGS :{SETX 12}Transparan binalar
-STR_TRANSPARENT_SIGNS_C :{CHECKMARK}{SETX 12}Transparan istasyon tabelalari
STR_TRANSPARENT_SIGNS :{SETX 12}Transparan istasyon tabelalari
############ range ends here
diff --git a/main_gui.c b/main_gui.c
index 198aa4464..3254ffeb5 100644
--- a/main_gui.c
+++ b/main_gui.c
@@ -436,37 +436,30 @@ static void MenuWndProc(Window *w, WindowEvent *e)
case WE_CREATE: w->widget[0].right = w->width - 1; break;
case WE_PAINT: {
- int count,sel;
- int x,y;
- uint16 chk;
- StringID string;
- int eo;
- int inc;
- byte color;
+ int x, y;
- DrawWindowWidgets(w);
+ byte count = WP(w, menu_d).item_count;
+ byte sel = WP(w, menu_d).sel_index;
+ uint16 chk = WP(w, menu_d).checked_items;
+ StringID string = WP(w, menu_d).string_id;
+ byte dis = WP(w, menu_d).disabled_items;
- count = WP(w,menu_d).item_count;
- sel = WP(w,menu_d).sel_index;
- chk = WP(w,menu_d).checked_items;
- string = WP(w,menu_d).string_id;
+ DrawWindowWidgets(w);
x = 1;
y = 1;
- eo = w->width - 3;
+ for (; count != 0; count--, string++, sel--) {
+ byte color = HASBIT(dis, 0) ? 14 : (sel == 0) ? 12 : 16;
+ if (sel == 0) GfxFillRect(x, y, x + w->width - 3, y + 9, 0);
- inc = (chk != 0) ? 2 : 1;
+ if (HASBIT(chk, 0)) DrawString(x + 2, y, STR_CHECKMARK, color);
+ DrawString(x + 2, y, string, color);
- do {
- if (sel== 0) GfxFillRect(x, y, x + eo, y+9, 0);
- color = sel == 0 ? 0xC : 0x10;
- if (HASBIT(WP(w,menu_d).disabled_items, (string - WP(w, menu_d).string_id))) color = 0xE;
- DrawString(x + 2, y, string + (chk & 1), color);
y += 10;
- string += inc;
chk >>= 1;
- } while (--sel,--count);
+ dis >>= 1;
+ }
} break;
case WE_DESTROY: {
@@ -490,7 +483,10 @@ static void MenuWndProc(Window *w, WindowEvent *e)
action_id = WP(w,menu_d).action_id;
DeleteWindow(w);
- if (index >= 0) _menu_clicked_procs[action_id](index);
+ if (index >= 0) {
+ assert((uint)index <= lengthof(_menu_clicked_procs));
+ _menu_clicked_procs[action_id](index);
+ }
break;
}
@@ -999,19 +995,18 @@ static void ToolbarHelpClick(Window *w)
static void ToolbarOptionsClick(Window *w)
{
- uint16 x;
+ uint16 x = 0;
w = PopupMainToolbMenu(w, 2, STR_02C3_GAME_OPTIONS, 13, 0);
- x = (uint16)-1;
- if (_display_opt & DO_SHOW_TOWN_NAMES) CLRBIT(x, 5);
- if (_display_opt & DO_SHOW_STATION_NAMES) CLRBIT(x, 6);
- if (_display_opt & DO_SHOW_SIGNS) CLRBIT(x, 7);
- if (_display_opt & DO_WAYPOINTS) CLRBIT(x, 8);
- if (_display_opt & DO_FULL_ANIMATION) CLRBIT(x, 9);
- if (_display_opt & DO_FULL_DETAIL) CLRBIT(x, 10);
- if (_display_opt & DO_TRANS_BUILDINGS) CLRBIT(x, 11);
- if (_display_opt & DO_TRANS_SIGNS) CLRBIT(x, 12);
+ if (_display_opt & DO_SHOW_TOWN_NAMES) SETBIT(x, 5);
+ if (_display_opt & DO_SHOW_STATION_NAMES) SETBIT(x, 6);
+ if (_display_opt & DO_SHOW_SIGNS) SETBIT(x, 7);
+ if (_display_opt & DO_WAYPOINTS) SETBIT(x, 8);
+ if (_display_opt & DO_FULL_ANIMATION) SETBIT(x, 9);
+ if (_display_opt & DO_FULL_DETAIL) SETBIT(x, 10);
+ if (_display_opt & DO_TRANS_BUILDINGS) SETBIT(x, 11);
+ if (_display_opt & DO_TRANS_SIGNS) SETBIT(x, 12);
WP(w,menu_d).checked_items = x;
}