petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r8522) -Regression (r8512): The flat/random window moved the to scenario editor did not use the right settings for generating land

Browse Source
This commit is contained in:
Darkvater
2007-02-01 22:54:04 +00:00
parent 99f860e686
commit 19c90a3bc0
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/genworld_gui.cpp
View File

@@ -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' */