File diff r15401:7caf76dd26ed → r15402:ee58828e73ce
src/openttd.cpp
Show inline comments
 
@@ -63,12 +63,13 @@
 
#include "company_base.h"
 
#include "engine_base.h"
 
#include "engine_func.h"
 
#include "core/random_func.hpp"
 
#include "rail_gui.h"
 
#include "core/backup_type.hpp"
 
#include "hotkeys.h"
 

	
 
#include "newgrf_commons.h"
 

	
 
#include "town.h"
 
#include "industry.h"
 

	
 
@@ -572,12 +573,13 @@ int ttd_main(int argc, char *argv[])
 

	
 
	AI::Initialize();
 
	LoadFromConfig();
 
	AI::Uninitialize(true);
 
	CheckConfig();
 
	LoadFromHighScore();
 
	LoadHotkeysFromConfig();
 

	
 
	if (resolution.width != 0) { _cur_resolution = resolution; }
 
	if (startyear != INVALID_YEAR) _settings_newgame.game_creation.starting_year = startyear;
 
	if (generation_seed != GENERATE_NEW_SEED) _settings_newgame.game_creation.generation_seed = generation_seed;
 

	
 
	/*
 
@@ -755,12 +757,13 @@ int ttd_main(int argc, char *argv[])
 

	
 
	WaitTillSaved();
 

	
 
	/* only save config if we have to */
 
	if (save_config) {
 
		SaveToConfig();
 
		SaveHotkeysToConfig();
 
		SaveToHighScore();
 
	}
 

	
 
	/* Reset windowing system, stop drivers, free used memory, ... */
 
	ShutdownGame();