mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r22795) -Codechange: load the intro game the first time without NewGRFs

release/1.2
rubidium 2011-08-21 12:52:24 +00:00
parent d1657fae80
commit 5ea6064fab
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/openttd.cpp
View File

@ -265,11 +265,15 @@ static void ShutdownGame()
FioCloseAll(); FioCloseAll();
} }
static void LoadIntroGame() /**
* Load the introduction game.
* @param load_newgrfs Whether to load the NewGRFs or not.
*/
static void LoadIntroGame(bool load_newgrfs = true)
{ {
_game_mode = GM_MENU; _game_mode = GM_MENU;
ResetGRFConfig(false); if (load_newgrfs) ResetGRFConfig(false);
/* Setup main window */ /* Setup main window */
ResetWindowSystem(); ResetWindowSystem();
@ -710,6 +714,8 @@ int ttd_main(int argc, char *argv[])
GenerateWorld(GWM_EMPTY, 64, 64); // Make the viewport initialization happy GenerateWorld(GWM_EMPTY, 64, 64); // Make the viewport initialization happy
WaitTillGeneratedWorld(); WaitTillGeneratedWorld();
LoadIntroGame(false);
CheckForMissingGlyphsInLoadedLanguagePack(); CheckForMissingGlyphsInLoadedLanguagePack();
ScanNewGRFFiles(new AfterNewGRFScan(network ? network_conn : NULL, join_server_password, join_company_password)); ScanNewGRFFiles(new AfterNewGRFScan(network ? network_conn : NULL, join_server_password, join_company_password));
@ -1227,7 +1233,7 @@ void GameLoop()
} }
/* switch game mode? */ /* switch game mode? */
if (_switch_mode != SM_NONE) { if (_switch_mode != SM_NONE && !HasModalProgress()) {
SwitchToMode(_switch_mode); SwitchToMode(_switch_mode);
_switch_mode = SM_NONE; _switch_mode = SM_NONE;
} }