diff options
author | Darkvater <darkvater@openttd.org> | 2007-02-01 22:54:04 +0000 |
---|---|---|
committer | Darkvater <darkvater@openttd.org> | 2007-02-01 22:54:04 +0000 |
commit | 19c90a3bc0b8499c78b5edffff5557bf0b3de79b (patch) | |
tree | edd7efc69c20d8d86433ed79142ae55a82293af3 /src/genworld_gui.cpp | |
parent | 99f860e68615b011b959ac9edb45660a0396dc1b (diff) | |
download | openttd-19c90a3bc0b8499c78b5edffff5557bf0b3de79b.tar.xz |
(svn r8522) -Regression (r8512): The flat/random window moved the to scenario editor did not use the right settings for generating land
Diffstat (limited to 'src/genworld_gui.cpp')
-rw-r--r-- | src/genworld_gui.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/genworld_gui.cpp b/src/genworld_gui.cpp index 4250a37a4..5faa3e94a 100644 --- a/src/genworld_gui.cpp +++ b/src/genworld_gui.cpp @@ -144,24 +144,21 @@ static const Widget _heightmap_load_widgets[] = { { WIDGETS_END}, }; -static void StartGeneratingLandscape(glwp_modes mode) +void StartGeneratingLandscape(glwp_modes mode) { - DeleteWindowByClass(WC_GENERATE_LANDSCAPE); - DeleteWindowByClass(WC_INDUSTRY_VIEW); - DeleteWindowByClass(WC_TOWN_VIEW); - DeleteWindowByClass(WC_LAND_INFO); + DeleteAllNonVitalWindows(); - /* Copy all XXX_newgame to XXX */ + /* Copy all XXX_newgame to XXX when coming from outside the editor */ UpdatePatches(); + _opt = _opt_newgame; _opt_ptr = &_opt; - *_opt_ptr = _opt_newgame; ResetGRFConfig(true); SndPlayFx(SND_15_BEEP); switch (mode) { case GLWP_GENERATE: _switch_mode = (_game_mode == GM_EDITOR) ? SM_GENRANDLAND : SM_NEWGAME; break; case GLWP_HEIGHTMAP: _switch_mode = (_game_mode == GM_EDITOR) ? SM_LOAD_HEIGHTMAP : SM_START_HEIGHTMAP; break; - case GLWP_SCENARIO: break; + case GLWP_SCENARIO: _switch_mode = SM_EDITOR; break; default: NOT_REACHED(); } } @@ -513,6 +510,11 @@ void ShowHeightmapLoad(void) _ShowGenerateLandscape(GLWP_HEIGHTMAP); } +void StartScenarioEditor(void) +{ + StartGeneratingLandscape(GLWP_SCENARIO); +} + void StartNewGameWithoutGUI(uint seed) { /* GenerateWorld takes care of the possible GENERATE_NEW_SEED value in 'seed' */ |