mirror of
https://github.com/OpenTTD/OpenTTD
synced 2026-01-29 15:14:33 +01:00
(svn r17158) [0.7] -Backport from trunk:
- Fix: Some typos in .obg stuff (r17136) - Fix: Mark industry tiles dirty when trigger are triggered (r17118) - Fix: Squirrel_export.sh failed for some locales (r17109) - Fix: Make restart command work again and make the help show how it works and how it does not work [FS#3092] (r17097) - Fix: Make ParseStringChoice a bit safer (r17095) - Change: Make strgen warn if the translation uses STRINGn or RAW_STRING instead of STRING (r17137, r17129)
This commit is contained in:
@@ -51,7 +51,7 @@ void InitializeCheats();
|
||||
void InitializeNPF();
|
||||
void InitializeOldNames();
|
||||
|
||||
void InitializeGame(uint size_x, uint size_y, bool reset_date)
|
||||
void InitializeGame(uint size_x, uint size_y, bool reset_date, bool reset_settings)
|
||||
{
|
||||
/* Make sure there isn't any window that can influence anything
|
||||
* related to the new game we're about to start/load. */
|
||||
@@ -68,7 +68,7 @@ void InitializeGame(uint size_x, uint size_y, bool reset_date)
|
||||
_date_fract = 0;
|
||||
_cur_tileloop_tile = 0;
|
||||
_thd.redsq = INVALID_TILE;
|
||||
MakeNewgameSettingsLive();
|
||||
if (reset_settings) MakeNewgameSettingsLive();
|
||||
|
||||
if (reset_date) {
|
||||
SetDate(ConvertYMDToDate(_settings_game.game_creation.starting_year, 0, 1));
|
||||
|
||||
Reference in New Issue
Block a user