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

(svn r18207) -Fix [FS#3324] (r11961): [NewGRF] When starting a new game the values of action D variable 13 were incorrect

release/1.0
rubidium 2009-11-21 16:39:36 +00:00
parent 5c6cf4f8d2
commit a274cc6a60
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/genworld.cpp
View File

@ -283,18 +283,19 @@ void GenerateWorld(GenerateWorldMode mode, uint size_x, uint size_y, bool reset_
/* Set the date before loading sprites as some newgrfs check it */ /* Set the date before loading sprites as some newgrfs check it */
SetDate(ConvertYMDToDate(_settings_game.game_creation.starting_year, 0, 1)); SetDate(ConvertYMDToDate(_settings_game.game_creation.starting_year, 0, 1));
InitializeGame(_gw.size_x, _gw.size_y, false, reset_settings);
PrepareGenerateWorldProgress();
/* Load the right landscape stuff */ /* Load the right landscape stuff */
GfxLoadSprites(); GfxLoadSprites();
LoadStringWidthTable(); LoadStringWidthTable();
InitializeGame(_gw.size_x, _gw.size_y, false, reset_settings);
PrepareGenerateWorldProgress();
/* Re-init the windowing system */ /* Re-init the windowing system */
ResetWindowSystem(); ResetWindowSystem();
/* Create toolbars */ /* Create toolbars */
SetupColoursAndInitialWindow(); SetupColoursAndInitialWindow();
SetObjectToPlace(SPR_CURSOR_ZZZ, PAL_NONE, HT_NONE, WC_MAIN_WINDOW, 0);
if (_gw.thread != NULL) { if (_gw.thread != NULL) {
_gw.thread->Join(); _gw.thread->Join();

2
src/misc.cpp
View File

@ -63,8 +63,6 @@ void InitializeGame(uint size_x, uint size_y, bool reset_date, bool reset_settin
AllocateMap(size_x, size_y); AllocateMap(size_x, size_y);
SetObjectToPlace(SPR_CURSOR_ZZZ, PAL_NONE, HT_NONE, WC_MAIN_WINDOW, 0);
_pause_mode = PM_UNPAUSED; _pause_mode = PM_UNPAUSED;
_fast_forward = 0; _fast_forward = 0;
_tick_counter = 0; _tick_counter = 0;