|
@@ -1045,15 +1045,12 @@ void SwitchToMode(SwitchMode new_mode)
|
|
|
|
|
|
MakeNewGame(false, new_mode == SM_NEWGAME);
|
|
|
break;
|
|
|
|
|
|
case SM_RESTARTGAME: // Restart --> 'Random game' with current settings
|
|
|
case SM_NEWGAME: // New Game --> 'Random game'
|
|
|
if (_network_server) {
|
|
|
seprintf(_network_game_info.map_name, lastof(_network_game_info.map_name), "Random Map");
|
|
|
}
|
|
|
MakeNewGame(false, new_mode == SM_NEWGAME);
|
|
|
break;
|
|
|
|
|
|
case SM_LOAD_GAME: { // Load game, Play Scenario
|
|
|
ResetGRFConfig(true);
|
|
|
ResetWindowSystem();
|
|
@@ -1070,24 +1067,18 @@ void SwitchToMode(SwitchMode new_mode)
|
|
|
* company #1 (eg 0) or in the case of a dedicated server a spectator */
|
|
|
SetLocalCompany(_network_dedicated ? COMPANY_SPECTATOR : COMPANY_FIRST);
|
|
|
/* Execute the game-start script */
|
|
|
IConsoleCmdExec("exec scripts/game_start.scr 0");
|
|
|
/* Decrease pause counter (was increased from opening load dialog) */
|
|
|
DoCommandP(0, PM_PAUSED_SAVELOAD, 0, CMD_PAUSE);
|
|
|
if (_network_server) {
|
|
|
seprintf(_network_game_info.map_name, lastof(_network_game_info.map_name), "%s (Loaded game)", _file_to_saveload.title);
|
|
|
}
|
|
|
}
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
case SM_RESTART_HEIGHTMAP: // Load a heightmap and start a new game from it with current settings
|
|
|
case SM_START_HEIGHTMAP: // Load a heightmap and start a new game from it
|
|
|
if (_network_server) {
|
|
|
seprintf(_network_game_info.map_name, lastof(_network_game_info.map_name), "%s (Heightmap)", _file_to_saveload.title);
|
|
|
}
|
|
|
MakeNewGame(true, new_mode == SM_START_HEIGHTMAP);
|
|
|
break;
|
|
|
|
|
|
case SM_LOAD_HEIGHTMAP: // Load heightmap from scenario editor
|
|
|
SetLocalCompany(OWNER_NONE);
|
|
|
|