|
|
|
@ -615,6 +615,8 @@ static void MakeNewGame(bool from_heightmap)
|
|
|
|
|
{
|
|
|
|
|
_game_mode = GM_NORMAL;
|
|
|
|
|
|
|
|
|
|
ResetGRFConfig(true);
|
|
|
|
|
|
|
|
|
|
GenerateWorldSetCallback(&MakeNewGameDone);
|
|
|
|
|
GenerateWorld(from_heightmap ? GW_HEIGHTMAP : GW_NEWGAME, 1 << _patches.map_x, 1 << _patches.map_y);
|
|
|
|
|
}
|
|
|
|
@ -630,6 +632,8 @@ static void MakeNewEditorWorld(void)
|
|
|
|
|
{
|
|
|
|
|
_game_mode = GM_EDITOR;
|
|
|
|
|
|
|
|
|
|
ResetGRFConfig(true);
|
|
|
|
|
|
|
|
|
|
GenerateWorldSetCallback(&MakeNewEditorWorldDone);
|
|
|
|
|
GenerateWorld(GW_EMPTY, 1 << _patches.map_x, 1 << _patches.map_y);
|
|
|
|
|
}
|
|
|
|
@ -660,6 +664,8 @@ static void StartScenario(void)
|
|
|
|
|
|
|
|
|
|
SetupColorsAndInitialWindow();
|
|
|
|
|
|
|
|
|
|
ResetGRFConfig(true);
|
|
|
|
|
|
|
|
|
|
// Load game
|
|
|
|
|
if (SaveOrLoad(_file_to_saveload.name, _file_to_saveload.mode) != SL_OK) {
|
|
|
|
|
LoadIntroGame();
|
|
|
|
@ -799,7 +805,6 @@ void SwitchMode(int new_mode)
|
|
|
|
|
Player *p;
|
|
|
|
|
|
|
|
|
|
_opt_ptr = &_opt;
|
|
|
|
|
ResetGRFConfig(true);
|
|
|
|
|
|
|
|
|
|
_local_player = OWNER_NONE;
|
|
|
|
|
_generating_world = true;
|
|
|
|
|