(svn r8507) -Codechange/Feature: Don't remove player-owned property on-load in the scenario editor. Add a button to the landscape window to do this.
--- a/src/lang/american.txt Thu Feb 01 01:40:46 2007 +0000
+++ b/src/lang/american.txt Thu Feb 01 12:51:10 2007 +0000
@@ -628,7 +628,6 @@
STR_022C_RESET_LANDSCAPE :{WHITE}Reset Landscape
STR_LOAD_GAME_HEIGHTMAP :{WHITE}Use Heightmap
STR_LOAD_SCEN_HEIGHTMAP :{BLACK}Use Heightmap
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO :{WHITE}Are you sure you want to reset the landscape?
STR_022E_LANDSCAPE_GENERATION :{BLACK}Landscape generation
STR_022F_TOWN_GENERATION :{BLACK}Town generation
STR_0230_INDUSTRY_GENERATION :{BLACK}Industry generation
--- a/src/lang/brazilian_portuguese.txt Thu Feb 01 01:40:46 2007 +0000
+++ b/src/lang/brazilian_portuguese.txt Thu Feb 01 12:51:10 2007 +0000
@@ -630,7 +630,6 @@
STR_022C_RESET_LANDSCAPE :{WHITE}Limpar Terreno
STR_LOAD_GAME_HEIGHTMAP :{WHITE}Usar mapa de altitudes
STR_LOAD_SCEN_HEIGHTMAP :{BLACK}Usar mapa de altitudes
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO :{WHITE}Tem a certeza que deseja limpar o terreno?
STR_022E_LANDSCAPE_GENERATION :{BLACK}Gerar terreno
STR_022F_TOWN_GENERATION :{BLACK}Gerar cidades
STR_0230_INDUSTRY_GENERATION :{BLACK}Gerar indústrias
--- a/src/lang/bulgarian.txt Thu Feb 01 01:40:46 2007 +0000
+++ b/src/lang/bulgarian.txt Thu Feb 01 12:51:10 2007 +0000
@@ -626,7 +626,6 @@
STR_022C_RESET_LANDSCAPE :{WHITE}Изчисти терена
STR_LOAD_GAME_HEIGHTMAP :{WHITE}Ползвай топо-карта
STR_LOAD_SCEN_HEIGHTMAP :{BLACK}Ползвай топо-карта
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO :{WHITE}Желаете ли да изчистите терена?
STR_022E_LANDSCAPE_GENERATION :{BLACK}Създаване на терен
STR_022F_TOWN_GENERATION :{BLACK}Създаване на град
STR_0230_INDUSTRY_GENERATION :{BLACK}Създаване на индустрия
--- a/src/lang/catalan.txt Thu Feb 01 01:40:46 2007 +0000
+++ b/src/lang/catalan.txt Thu Feb 01 12:51:10 2007 +0000
@@ -628,7 +628,6 @@
STR_022C_RESET_LANDSCAPE :{WHITE}Restablir Paisatge
STR_LOAD_GAME_HEIGHTMAP :{WHITE}Utilitza un mapa d'alçades
STR_LOAD_SCEN_HEIGHTMAP :{BLACK}Utilitza un mapa d'alçades
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO :{WHITE}Estàs segur que vols restablir el paisatge?
STR_022E_LANDSCAPE_GENERATION :{BLACK}Generació de Paisatges
STR_022F_TOWN_GENERATION :{BLACK}Generació de Poblacions
STR_0230_INDUSTRY_GENERATION :{BLACK}Generació d'indústries
--- a/src/lang/czech.txt Thu Feb 01 01:40:46 2007 +0000
+++ b/src/lang/czech.txt Thu Feb 01 12:51:10 2007 +0000
@@ -742,7 +742,6 @@
STR_022C_RESET_LANDSCAPE :{WHITE}Smazat krajinu
STR_LOAD_GAME_HEIGHTMAP :{WHITE}Použít výškovou mapu
STR_LOAD_SCEN_HEIGHTMAP :{BLACK}Použít výškovou mapu
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO :{WHITE}Urcite chceš smazat krajinu?
STR_022E_LANDSCAPE_GENERATION :{BLACK}Generování krajiny
STR_022F_TOWN_GENERATION :{BLACK}Generování měst
STR_0230_INDUSTRY_GENERATION :{BLACK}Generování průmyslu
--- a/src/lang/danish.txt Thu Feb 01 01:40:46 2007 +0000
+++ b/src/lang/danish.txt Thu Feb 01 12:51:10 2007 +0000
@@ -628,7 +628,6 @@
STR_022C_RESET_LANDSCAPE :{WHITE}Nulstil landskab
STR_LOAD_GAME_HEIGHTMAP :{WHITE}Brug højdekort
STR_LOAD_SCEN_HEIGHTMAP :{BLACK}Brug højdekort
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO :{WHITE}Er du sikker på, at du vil nulstille landskabet?
STR_022E_LANDSCAPE_GENERATION :{BLACK}Landskabsgenerering
STR_022F_TOWN_GENERATION :{BLACK}Bygenerering
STR_0230_INDUSTRY_GENERATION :{BLACK}Industrigenerering
--- a/src/lang/dutch.txt Thu Feb 01 01:40:46 2007 +0000
+++ b/src/lang/dutch.txt Thu Feb 01 12:51:10 2007 +0000
@@ -628,7 +628,6 @@
STR_022C_RESET_LANDSCAPE :{WHITE}Verwijder landschap
STR_LOAD_GAME_HEIGHTMAP :{WHITE}Gebruik hoogtekaart
STR_LOAD_SCEN_HEIGHTMAP :{BLACK}Gebruik hoogtekaart
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO :{WHITE}Weet je zeker dat je het land wilt verwijderen?
STR_022E_LANDSCAPE_GENERATION :{BLACK}Landschapproductie
STR_022F_TOWN_GENERATION :{BLACK}Stadproductie
STR_0230_INDUSTRY_GENERATION :{BLACK}Industrieproductie
--- a/src/lang/english.txt Thu Feb 01 01:40:46 2007 +0000
+++ b/src/lang/english.txt Thu Feb 01 12:51:10 2007 +0000
@@ -626,9 +626,10 @@
STR_022A_GENERATE_RANDOM_LAND :{BLACK}Generate random land
STR_022B_RESET_LANDSCAPE :{BLACK}Reset landscape
STR_022C_RESET_LANDSCAPE :{WHITE}Reset Landscape
+STR_RESET_LANDSCAPE_TOOLTIP :{BLACK}Remove all player-owned property from the map
STR_LOAD_GAME_HEIGHTMAP :{WHITE}Use Heightmap
STR_LOAD_SCEN_HEIGHTMAP :{BLACK}Use Heightmap
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO :{WHITE}Are you sure you want to reset the landscape?
+STR_RESET_LANDSCAPE_CONFIRMATION_TEXT :{WHITE}Are you sure you want to remove all player-owned property?
STR_022E_LANDSCAPE_GENERATION :{BLACK}Landscape generation
STR_022F_TOWN_GENERATION :{BLACK}Town generation
STR_0230_INDUSTRY_GENERATION :{BLACK}Industry generation
--- a/src/lang/esperanto.txt Thu Feb 01 01:40:46 2007 +0000
+++ b/src/lang/esperanto.txt Thu Feb 01 12:51:10 2007 +0000
@@ -629,7 +629,6 @@
STR_022C_RESET_LANDSCAPE :{WHITE}Reigu Landaspekton
STR_LOAD_GAME_HEIGHTMAP :{WHITE}Uzu Altecmapon
STR_LOAD_SCEN_HEIGHTMAP :{BLACK}Uzu Altecmapon
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO :{WHITE}Ĉu vi certas ke vi volas reigi la landaspekton?
STR_022E_LANDSCAPE_GENERATION :{BLACK}Landaspekta generado
STR_022F_TOWN_GENERATION :{BLACK}Urba generado
STR_0230_INDUSTRY_GENERATION :{BLACK}Industria generado
--- a/src/lang/estonian.txt Thu Feb 01 01:40:46 2007 +0000
+++ b/src/lang/estonian.txt Thu Feb 01 12:51:10 2007 +0000
@@ -724,7 +724,6 @@
STR_022C_RESET_LANDSCAPE :{WHITE}Nulli maastik
STR_LOAD_GAME_HEIGHTMAP :{WHITE}Kasuta Kõrguskaarti
STR_LOAD_SCEN_HEIGHTMAP :{BLACK}Kasuta Kõrguskaarti
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO :{WHITE}Oled sa kindel, et sa tahad maastikku nullida?
STR_022E_LANDSCAPE_GENERATION :{BLACK}Maastiku loomine
STR_022F_TOWN_GENERATION :{BLACK}Linnade loomine
STR_0230_INDUSTRY_GENERATION :{BLACK}Tööstuste loomine
--- a/src/lang/finnish.txt Thu Feb 01 01:40:46 2007 +0000
+++ b/src/lang/finnish.txt Thu Feb 01 12:51:10 2007 +0000
@@ -624,7 +624,6 @@
STR_022C_RESET_LANDSCAPE :{WHITE}Nollaa maasto
STR_LOAD_GAME_HEIGHTMAP :{WHITE}Käytä korkeuskarttaa
STR_LOAD_SCEN_HEIGHTMAP :{BLACK}Käytä korkeuskarttaa
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO :{WHITE}Nollataanko maasto?
STR_022E_LANDSCAPE_GENERATION :{BLACK}Luo maasto
STR_022F_TOWN_GENERATION :{BLACK}Luo kaupunkeja
STR_0230_INDUSTRY_GENERATION :{BLACK}Luo teollisuutta
--- a/src/lang/french.txt Thu Feb 01 01:40:46 2007 +0000
+++ b/src/lang/french.txt Thu Feb 01 12:51:10 2007 +0000
@@ -629,7 +629,6 @@
STR_022C_RESET_LANDSCAPE :{WHITE}Réinitialiser le terrain
STR_LOAD_GAME_HEIGHTMAP :{WHITE}Carte d'altitude
STR_LOAD_SCEN_HEIGHTMAP :{BLACK}Utiliser une carte d'altitude
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO :{WHITE}Voulez-vous vraiment réinitialiser le terrain?
STR_022E_LANDSCAPE_GENERATION :{BLACK}Créer le terrain
STR_022F_TOWN_GENERATION :{BLACK}Créer les villes
STR_0230_INDUSTRY_GENERATION :{BLACK}Créer les industries
--- a/src/lang/galician.txt Thu Feb 01 01:40:46 2007 +0000
+++ b/src/lang/galician.txt Thu Feb 01 12:51:10 2007 +0000
@@ -610,7 +610,6 @@
STR_022A_GENERATE_RANDOM_LAND :{BLACK}Xerar terreo aleatorio
STR_022B_RESET_LANDSCAPE :{BLACK}Reiniciar paisaxe
STR_022C_RESET_LANDSCAPE :{WHITE}Reiniciar paisaxe
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO :{WHITE}¿Está seguro de querer reinicia-la paisaxe?
STR_022E_LANDSCAPE_GENERATION :{BLACK}Xeración de paisaxe
STR_022F_TOWN_GENERATION :{BLACK}Xeración de cidades
STR_0230_INDUSTRY_GENERATION :{BLACK}Xeración de industrias
--- a/src/lang/german.txt Thu Feb 01 01:40:46 2007 +0000
+++ b/src/lang/german.txt Thu Feb 01 12:51:10 2007 +0000
@@ -629,7 +629,6 @@
STR_022C_RESET_LANDSCAPE :{WHITE}Landfläche wiederherstellen
STR_LOAD_GAME_HEIGHTMAP :{WHITE}Reliefkarte nutzen
STR_LOAD_SCEN_HEIGHTMAP :{BLACK}Reliefkarte nutzen
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO :{WHITE}Bist du sicher, dass die Landschaft zurückgesetzt werden soll?
STR_022E_LANDSCAPE_GENERATION :{BLACK}Landfläche erzeugen
STR_022F_TOWN_GENERATION :{BLACK}Stadt errichten
STR_0230_INDUSTRY_GENERATION :{BLACK}Industrie errichten
--- a/src/lang/hungarian.txt Thu Feb 01 01:40:46 2007 +0000
+++ b/src/lang/hungarian.txt Thu Feb 01 12:51:10 2007 +0000
@@ -694,7 +694,6 @@
STR_022C_RESET_LANDSCAPE :{WHITE}Táj törlése
STR_LOAD_GAME_HEIGHTMAP :{WHITE}Magasságtérkép használata
STR_LOAD_SCEN_HEIGHTMAP :{BLACK}Magasságtérkép használata
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO :{WHITE}Biztosan le akarod törölni az egész tájat?
STR_022E_LANDSCAPE_GENERATION :{BLACK}Táj szerkesztése
STR_022F_TOWN_GENERATION :{BLACK}Városkészítés
STR_0230_INDUSTRY_GENERATION :{BLACK}Gazdasági épület készítése
--- a/src/lang/icelandic.txt Thu Feb 01 01:40:46 2007 +0000
+++ b/src/lang/icelandic.txt Thu Feb 01 12:51:10 2007 +0000
@@ -605,7 +605,6 @@
STR_022A_GENERATE_RANDOM_LAND :{BLACK}Mynda til land af handahófi
STR_022B_RESET_LANDSCAPE :{BLACK}Eyða landi
STR_022C_RESET_LANDSCAPE :{WHITE}Eyða landi
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO :{WHITE}Ertu viss um að þú viljir eyða landinu?
STR_022E_LANDSCAPE_GENERATION :{BLACK}Landslagsgerð
STR_022F_TOWN_GENERATION :{BLACK}Bæjargerð
STR_0230_INDUSTRY_GENERATION :{BLACK}Iðnaðargerð
--- a/src/lang/italian.txt Thu Feb 01 01:40:46 2007 +0000
+++ b/src/lang/italian.txt Thu Feb 01 12:51:10 2007 +0000
@@ -628,7 +628,6 @@
STR_022C_RESET_LANDSCAPE :{WHITE}Azzerra Paesaggio
STR_LOAD_GAME_HEIGHTMAP :{WHITE}Usa Heightmap
STR_LOAD_SCEN_HEIGHTMAP :{BLACK}Usa Heightmap
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO :{WHITE}Sei sicuro di voler azzerrare il paesaggio?
STR_022E_LANDSCAPE_GENERATION :{BLACK}Generazione paesaggio
STR_022F_TOWN_GENERATION :{BLACK}Generazione città
STR_0230_INDUSTRY_GENERATION :{BLACK}Generazione industrie
--- a/src/lang/japanese.txt Thu Feb 01 01:40:46 2007 +0000
+++ b/src/lang/japanese.txt Thu Feb 01 12:51:10 2007 +0000
@@ -628,7 +628,6 @@
STR_022C_RESET_LANDSCAPE :{WHITE}地形のリセット
STR_LOAD_GAME_HEIGHTMAP :{WHITE}ハイトマップを使用
STR_LOAD_SCEN_HEIGHTMAP :{BLACK}ハイトマップを使用
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO :{WHITE}地形をリセットしてもよろしいですか？
STR_022E_LANDSCAPE_GENERATION :{BLACK}地形の作成
STR_022F_TOWN_GENERATION :{BLACK}市町村の建設
STR_0230_INDUSTRY_GENERATION :{BLACK}産業の建設
--- a/src/lang/korean.txt Thu Feb 01 01:40:46 2007 +0000
+++ b/src/lang/korean.txt Thu Feb 01 12:51:10 2007 +0000
@@ -629,7 +629,6 @@
STR_022C_RESET_LANDSCAPE :{WHITE}풍경 리셋
STR_LOAD_GAME_HEIGHTMAP :{WHITE}DEM지형 사용
STR_LOAD_SCEN_HEIGHTMAP :{BLACK}DEM지형 사용
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO :{WHITE}정말로 지형을 초기화하시겠습니까?
STR_022E_LANDSCAPE_GENERATION :{BLACK}지형 생성기
STR_022F_TOWN_GENERATION :{BLACK}마을 생성
STR_0230_INDUSTRY_GENERATION :{BLACK}산업 시설 생성
--- a/src/lang/lithuanian.txt Thu Feb 01 01:40:46 2007 +0000
+++ b/src/lang/lithuanian.txt Thu Feb 01 12:51:10 2007 +0000
@@ -658,7 +658,6 @@
STR_022C_RESET_LANDSCAPE :{WHITE}Anuliuoti kraštovaizdį
STR_LOAD_GAME_HEIGHTMAP :{WHITE}Naudoti Papildoma Zemelapi
STR_LOAD_SCEN_HEIGHTMAP :{BLACK}Naudoti Papildoma Zemelapi
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO :{WHITE}Ar tikrai norite anuliuoti kraštovaiždį?
STR_022E_LANDSCAPE_GENERATION :{BLACK}Kraštovaizdžio kūrimas
STR_022F_TOWN_GENERATION :{BLACK}Miesto įkūrimas
STR_0230_INDUSTRY_GENERATION :{BLACK}Pramonės kūrimas
--- a/src/lang/norwegian_bokmal.txt Thu Feb 01 01:40:46 2007 +0000
+++ b/src/lang/norwegian_bokmal.txt Thu Feb 01 12:51:10 2007 +0000
@@ -624,7 +624,6 @@
STR_022C_RESET_LANDSCAPE :{WHITE}Tilbakestill landskap
STR_LOAD_GAME_HEIGHTMAP :{WHITE}Bruk høydekart
STR_LOAD_SCEN_HEIGHTMAP :{BLACK}Bruk høydekart
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO :{WHITE}Er du sikkert på du vil tilbakestille landskapet?
STR_022E_LANDSCAPE_GENERATION :{BLACK}Landskapsgenerering
STR_022F_TOWN_GENERATION :{BLACK}Bygenerering
STR_0230_INDUSTRY_GENERATION :{BLACK}Industrigenerering
--- a/src/lang/norwegian_nynorsk.txt Thu Feb 01 01:40:46 2007 +0000
+++ b/src/lang/norwegian_nynorsk.txt Thu Feb 01 12:51:10 2007 +0000
@@ -629,7 +629,6 @@
STR_022C_RESET_LANDSCAPE :{WHITE}Nullstill landskap
STR_LOAD_GAME_HEIGHTMAP :{WHITE}Bruk høgdekart
STR_LOAD_SCEN_HEIGHTMAP :{BLACK}Bruk høgdekart
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO :{WHITE}Er du sikker på at du vil nullstille landskapet?
STR_022E_LANDSCAPE_GENERATION :{BLACK}Landskapsgenerering
STR_022F_TOWN_GENERATION :{BLACK}Bygenerering
STR_0230_INDUSTRY_GENERATION :{BLACK}Industrigenerering
--- a/src/lang/polish.txt Thu Feb 01 01:40:46 2007 +0000
+++ b/src/lang/polish.txt Thu Feb 01 12:51:10 2007 +0000
@@ -681,7 +681,6 @@
STR_022C_RESET_LANDSCAPE :{WHITE}Resetuj krajobraz
STR_LOAD_GAME_HEIGHTMAP :{WHITE}Użyj mapy wysokości
STR_LOAD_SCEN_HEIGHTMAP :{BLACK}Użyj mapy wysokości
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO :{WHITE}Jesteś pewien że chcesz zrestartować krajobraz?
STR_022E_LANDSCAPE_GENERATION :{BLACK}Tworzenie krajobrazu
STR_022F_TOWN_GENERATION :{BLACK}Tworzenie miast
STR_0230_INDUSTRY_GENERATION :{BLACK}Tworzenie przedsiębiorstw
--- a/src/lang/portuguese.txt Thu Feb 01 01:40:46 2007 +0000
+++ b/src/lang/portuguese.txt Thu Feb 01 12:51:10 2007 +0000
@@ -628,7 +628,6 @@
STR_022C_RESET_LANDSCAPE :{WHITE}Repor Terreno
STR_LOAD_GAME_HEIGHTMAP :{WHITE}Usar mapa de alturas
STR_LOAD_SCEN_HEIGHTMAP :{BLACK}Usar mapa de alturas
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO :{WHITE}Tem a certeza que deseja repor o terreno?
STR_022E_LANDSCAPE_GENERATION :{BLACK}A gerar terreno
STR_022F_TOWN_GENERATION :{BLACK}A gerar cidades
STR_0230_INDUSTRY_GENERATION :{BLACK}A gerar indústrias
--- a/src/lang/romanian.txt Thu Feb 01 01:40:46 2007 +0000
+++ b/src/lang/romanian.txt Thu Feb 01 12:51:10 2007 +0000
@@ -628,7 +628,6 @@
STR_022C_RESET_LANDSCAPE :{WHITE}Resetare peisaj
STR_LOAD_GAME_HEIGHTMAP :{WHITE}Foloseste harta de inaltimi
STR_LOAD_SCEN_HEIGHTMAP :{BLACK}Foloseste harta inaltimi
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO :{WHITE}Esti sigur cã vrei sa resetezi peisajul?
STR_022E_LANDSCAPE_GENERATION :{BLACK}Generare peisaj
STR_022F_TOWN_GENERATION :{BLACK}Generare oras
STR_0230_INDUSTRY_GENERATION :{BLACK}Generare industrii
--- a/src/lang/russian.txt Thu Feb 01 01:40:46 2007 +0000
+++ b/src/lang/russian.txt Thu Feb 01 12:51:10 2007 +0000
@@ -624,7 +624,6 @@
STR_022C_RESET_LANDSCAPE :{WHITE}Сбросить карту
STR_LOAD_GAME_HEIGHTMAP :{WHITE}Исп. РЕЛЬЕФ
STR_LOAD_SCEN_HEIGHTMAP :{BLACK}Исп. РЕЛЬЕФ
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO :{WHITE}Вы уверены что хотите сбросить землю?
STR_022E_LANDSCAPE_GENERATION :{BLACK}Создание ландшафта
STR_022F_TOWN_GENERATION :{BLACK}Создание города
STR_0230_INDUSTRY_GENERATION :{BLACK}Создание промышленности
--- a/src/lang/simplified_chinese.txt Thu Feb 01 01:40:46 2007 +0000
+++ b/src/lang/simplified_chinese.txt Thu Feb 01 12:51:10 2007 +0000
@@ -628,7 +628,6 @@
STR_022C_RESET_LANDSCAPE :{WHITE}重置景观
STR_LOAD_GAME_HEIGHTMAP :{WHITE}使用高度图
STR_LOAD_SCEN_HEIGHTMAP :{BLACK}使用高度图
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO :{WHITE}你确定要重置景观吗？
STR_022E_LANDSCAPE_GENERATION :{BLACK}生成景观
STR_022F_TOWN_GENERATION :{BLACK}生成城镇
STR_0230_INDUSTRY_GENERATION :{BLACK}生成工业
--- a/src/lang/slovak.txt Thu Feb 01 01:40:46 2007 +0000
+++ b/src/lang/slovak.txt Thu Feb 01 12:51:10 2007 +0000
@@ -692,7 +692,6 @@
STR_022C_RESET_LANDSCAPE :{WHITE}Zresetovat Uzemie
STR_LOAD_GAME_HEIGHTMAP :{WHITE}Pouzit vyskovu mapu
STR_LOAD_SCEN_HEIGHTMAP :{BLACK}Pouzit vyskovu mapu
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO :{WHITE}Si si isty ze chces zresetovat uzemie ?
STR_022E_LANDSCAPE_GENERATION :{BLACK}Vytvorenie uzemia
STR_022F_TOWN_GENERATION :{BLACK}Vytvorenie mesta
STR_0230_INDUSTRY_GENERATION :{BLACK}Vytvorenie priemyslu
--- a/src/lang/slovenian.txt Thu Feb 01 01:40:46 2007 +0000
+++ b/src/lang/slovenian.txt Thu Feb 01 12:51:10 2007 +0000
@@ -670,7 +670,6 @@
STR_022C_RESET_LANDSCAPE :{WHITE}Zbriši pokrajino
STR_LOAD_GAME_HEIGHTMAP :{WHITE}Uporabi višinsko karto
STR_LOAD_SCEN_HEIGHTMAP :{BLACK}Uporabi višinsko karto
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO :{WHITE}Zagotovo želiš uničiti pokrajino?
STR_022E_LANDSCAPE_GENERATION :{BLACK}Generator pokrajine
STR_022F_TOWN_GENERATION :{BLACK}Generator mest
STR_0230_INDUSTRY_GENERATION :{BLACK}Generator industrije
--- a/src/lang/spanish.txt Thu Feb 01 01:40:46 2007 +0000
+++ b/src/lang/spanish.txt Thu Feb 01 12:51:10 2007 +0000
@@ -629,7 +629,6 @@
STR_022C_RESET_LANDSCAPE :{WHITE}Hacer reset del paisaje
STR_LOAD_GAME_HEIGHTMAP :{WHITE}Usar Mapa de alturas
STR_LOAD_SCEN_HEIGHTMAP :{BLACK}Usar Mapa de alturas
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO :{WHITE}¿Está seguro que desea realizar un reset al paisaje?
STR_022E_LANDSCAPE_GENERATION :{BLACK}Generación de paisaje
STR_022F_TOWN_GENERATION :{BLACK}Generación de poblaciones
STR_0230_INDUSTRY_GENERATION :{BLACK}Generación de industria
--- a/src/lang/swedish.txt Thu Feb 01 01:40:46 2007 +0000
+++ b/src/lang/swedish.txt Thu Feb 01 12:51:10 2007 +0000
@@ -628,7 +628,6 @@
STR_022C_RESET_LANDSCAPE :{WHITE}Återställ landskapet
STR_LOAD_GAME_HEIGHTMAP :{WHITE}Använd höjdkarta
STR_LOAD_SCEN_HEIGHTMAP :{BLACK}Använd höjdkarta
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO :{WHITE}Vill du verkligen återställa landskapet?
STR_022E_LANDSCAPE_GENERATION :{BLACK}Skapa landskap
STR_022F_TOWN_GENERATION :{BLACK}Bygg städer
STR_0230_INDUSTRY_GENERATION :{BLACK}Bygg industrier
--- a/src/lang/turkish.txt Thu Feb 01 01:40:46 2007 +0000
+++ b/src/lang/turkish.txt Thu Feb 01 12:51:10 2007 +0000
@@ -628,7 +628,6 @@
STR_022C_RESET_LANDSCAPE :{WHITE}Haritayı Sıfırla
STR_LOAD_GAME_HEIGHTMAP :{WHITE}Yükseklik Haritasi Kullan
STR_LOAD_SCEN_HEIGHTMAP :{BLACK}Yükseklik Haritasi Kullan
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO :{WHITE}Her taraf su olsun mu?
STR_022E_LANDSCAPE_GENERATION :{BLACK}Harita yapımı
STR_022F_TOWN_GENERATION :{BLACK}Şehir yapımı
STR_0230_INDUSTRY_GENERATION :{BLACK}Fabrika yapımı
--- a/src/lang/ukrainian.txt Thu Feb 01 01:40:46 2007 +0000
+++ b/src/lang/ukrainian.txt Thu Feb 01 12:51:10 2007 +0000
@@ -737,7 +737,6 @@
STR_022C_RESET_LANDSCAPE :{WHITE}Очистити ландшафт
STR_LOAD_GAME_HEIGHTMAP :{WHITE}Використовувати рельєф
STR_LOAD_SCEN_HEIGHTMAP :{BLACK}Взяти з карти висот
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO :{WHITE}Ви дійсно бажаєте очистити ландшафт?
STR_022E_LANDSCAPE_GENERATION :{BLACK}Створення ландшафту
STR_022F_TOWN_GENERATION :{BLACK}Створення міст
STR_0230_INDUSTRY_GENERATION :{BLACK}Створення виробництва
--- a/src/main_gui.cpp Thu Feb 01 01:40:46 2007 +0000
+++ b/src/main_gui.cpp Thu Feb 01 12:51:10 2007 +0000
@@ -1146,18 +1146,19 @@
{ WWT_CLOSEBOX, RESIZE_NONE, 7, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
{ WWT_CAPTION, RESIZE_NONE, 7, 11, 169, 0, 13, STR_0223_LAND_GENERATION, STR_018C_WINDOW_TITLE_DRAG_THIS},
{ WWT_STICKYBOX, RESIZE_NONE, 7, 170, 181, 0, 13, STR_NULL, STR_STICKY_BUTTON},
-{ WWT_PANEL, RESIZE_NONE, 7, 0, 181, 14, 95, 0x0, STR_NULL},
-{ WWT_IMGBTN, RESIZE_NONE, 14, 2, 23, 14, 35, SPR_IMG_DYNAMITE, STR_018D_DEMOLISH_BUILDINGS_ETC},
-{ WWT_IMGBTN, RESIZE_NONE, 14, 24, 45, 14, 35, SPR_IMG_TERRAFORM_DOWN, STR_018E_LOWER_A_CORNER_OF_LAND},
-{ WWT_IMGBTN, RESIZE_NONE, 14, 46, 67, 14, 35, SPR_IMG_TERRAFORM_UP, STR_018F_RAISE_A_CORNER_OF_LAND},
-{ WWT_IMGBTN, RESIZE_NONE, 14, 68, 89, 14, 35, SPR_IMG_LEVEL_LAND, STR_LEVEL_LAND_TOOLTIP},
-{ WWT_IMGBTN, RESIZE_NONE, 14, 90, 111, 14, 35, SPR_IMG_BUILD_CANAL, STR_CREATE_LAKE},
-{ WWT_IMGBTN, RESIZE_NONE, 14, 112, 134, 14, 35, SPR_IMG_ROCKS, STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE},
-{ WWT_IMGBTN, RESIZE_NONE, 14, 135, 157, 14, 35, SPR_IMG_LIGHTHOUSE_DESERT, STR_NULL}, // XXX - dynamic
-{ WWT_IMGBTN, RESIZE_NONE, 14, 158, 179, 14, 35, SPR_IMG_TRANSMITTER, STR_028E_PLACE_TRANSMITTER},
-{ WWT_TEXTBTN, RESIZE_NONE, 14, 139, 149, 43, 54, STR_0224, STR_0228_INCREASE_SIZE_OF_LAND_AREA},
-{ WWT_TEXTBTN, RESIZE_NONE, 14, 139, 149, 56, 67, STR_0225, STR_0229_DECREASE_SIZE_OF_LAND_AREA},
-{ WWT_TEXTBTN, RESIZE_NONE, 14, 34, 149, 75, 86, STR_SE_NEW_WORLD, STR_022A_GENERATE_RANDOM_LAND},
+{ WWT_PANEL, RESIZE_NONE, 7, 0, 181, 14, 102, 0x0, STR_NULL},
+{ WWT_IMGBTN, RESIZE_NONE, 14, 2, 23, 16, 37, SPR_IMG_DYNAMITE, STR_018D_DEMOLISH_BUILDINGS_ETC},
+{ WWT_IMGBTN, RESIZE_NONE, 14, 24, 45, 16, 37, SPR_IMG_TERRAFORM_DOWN, STR_018E_LOWER_A_CORNER_OF_LAND},
+{ WWT_IMGBTN, RESIZE_NONE, 14, 46, 67, 16, 37, SPR_IMG_TERRAFORM_UP, STR_018F_RAISE_A_CORNER_OF_LAND},
+{ WWT_IMGBTN, RESIZE_NONE, 14, 68, 89, 16, 37, SPR_IMG_LEVEL_LAND, STR_LEVEL_LAND_TOOLTIP},
+{ WWT_IMGBTN, RESIZE_NONE, 14, 90, 111, 16, 37, SPR_IMG_BUILD_CANAL, STR_CREATE_LAKE},
+{ WWT_IMGBTN, RESIZE_NONE, 14, 112, 134, 16, 37, SPR_IMG_ROCKS, STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE},
+{ WWT_IMGBTN, RESIZE_NONE, 14, 135, 157, 16, 37, SPR_IMG_LIGHTHOUSE_DESERT, STR_NULL}, // XXX - dynamic
+{ WWT_IMGBTN, RESIZE_NONE, 14, 158, 179, 16, 37, SPR_IMG_TRANSMITTER, STR_028E_PLACE_TRANSMITTER},
+{ WWT_IMGBTN, RESIZE_NONE, 14, 139, 150, 45, 56, SPR_ARROW_UP, STR_0228_INCREASE_SIZE_OF_LAND_AREA},
+{ WWT_IMGBTN, RESIZE_NONE, 14, 139, 150, 58, 69, SPR_ARROW_DOWN, STR_0229_DECREASE_SIZE_OF_LAND_AREA},
+{ WWT_TEXTBTN, RESIZE_NONE, 14, 34, 145, 76, 87, STR_SE_NEW_WORLD, STR_022A_GENERATE_RANDOM_LAND},
+{ WWT_TEXTBTN, RESIZE_NONE, 14, 34, 145, 89, 100, STR_022B_RESET_LANDSCAPE, STR_RESET_LANDSCAPE_TOOLTIP},
{ WIDGETS_END},
};
@@ -1237,6 +1238,34 @@
EditorTerraformClick_Transmitter
};
+
+/** Callback function for the scenario editor 'reset landscape' confirmation window
+ * @param yes_clicked boolean value, true when yes was clicked, false otherwise */
+static void ResetLandscapeConfirmationCallback(Window *w, bool confirmed)
+{
+ if (confirmed) {
+ Player *p;
+
+ /* Set generating_world to true to get instant-green grass after removing
+ * player property. */
+ _generating_world = true;
+ /* Delete all players */
+ FOR_ALL_PLAYERS(p) {
+ if (p->is_active) {
+ ChangeOwnershipOfPlayerItems(p->index, PLAYER_SPECTATOR);
+ p->is_active = false;
+ }
+ }
+ _generating_world = false;
+
+ /* Delete all stations owned by a player */
+ Station *st;
+ FOR_ALL_STATIONS(st) {
+ if (IsValidPlayer(st->owner)) delete st;
+ }
+ }
+}
+
static void ScenEditLandGenWndProc(Window *w, WindowEvent *e)
{
switch (e->event) {
@@ -1296,6 +1325,13 @@
HandleButtonClick(w, 14);
ShowCreateScenario();
break;
+ case 15: /* Reset landscape */
+ ShowQuery(
+ STR_022C_RESET_LANDSCAPE,
+ STR_RESET_LANDSCAPE_CONFIRMATION_TEXT,
+ NULL,
+ ResetLandscapeConfirmationCallback);
+ break;
}
break;
@@ -1332,7 +1368,7 @@
}
static const WindowDesc _scen_edit_land_gen_desc = {
- WDP_AUTO, WDP_AUTO, 182, 96,
+ WDP_AUTO, WDP_AUTO, 182, 103,
WC_SCEN_LAND_GEN,0,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON,
_scen_edit_land_gen_widgets,
--- a/src/openttd.cpp Thu Feb 01 01:40:46 2007 +0000
+++ b/src/openttd.cpp Thu Feb 01 12:51:10 2007 +0000
@@ -70,8 +70,6 @@
void DoPaletteAnimations(void);
void MusicLoop(void);
void ResetMusic(void);
-void InitializeStations(void);
-void DeleteAllPlayerStations(void);
extern void SetDifficultyLevel(int mode, GameOptions *gm_opt);
extern Player* DoStartupNewPlayer(bool is_ai);
@@ -840,23 +838,10 @@
case SM_LOAD_SCENARIO: { /* Load scenario from scenario editor */
if (SafeSaveOrLoad(_file_to_saveload.name, _file_to_saveload.mode, GM_EDITOR)) {
- Player *p;
-
_opt_ptr = &_opt;
SetLocalPlayer(OWNER_NONE);
- _generating_world = true;
- /* Delete all players */
- FOR_ALL_PLAYERS(p) {
- if (p->is_active) {
- ChangeOwnershipOfPlayerItems(p->index, PLAYER_SPECTATOR);
- p->is_active = false;
- }
- }
- _generating_world = false;
_patches_newgame.starting_year = _cur_year;
- // delete all stations owned by a player
- DeleteAllPlayerStations();
} else {
ShowErrorMessage(INVALID_STRING_ID, STR_4009_GAME_LOAD_FAILED, 0, 0);
}
--- a/src/station_cmd.cpp Thu Feb 01 01:40:46 2007 +0000
+++ b/src/station_cmd.cpp Thu Feb 01 12:51:10 2007 +0000
@@ -2299,16 +2299,6 @@
return 0;
}
-
-void DeleteAllPlayerStations(void)
-{
- Station *st;
-
- FOR_ALL_STATIONS(st) {
- if (IsValidPlayer(st->owner)) delete st;
- }
-}
-
/* this function is called for one station each tick */
static void StationHandleBigTick(Station *st)
{