diff options
| author | rubidium <rubidium@openttd.org> | 2009-05-06 15:06:57 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-05-06 15:06:57 +0000 |
| commit | 2664f2a2d95dbc2122ff1f9b96e8569ae401892f (patch) | |
| tree | fb2112ce7a51edd259190186790bf00319a53510 /src/saveload/afterload.cpp | |
| parent | bb121a1510fbd3faea71b794b1f6bdaba1641665 (diff) | |
| download | openttd-2664f2a2d95dbc2122ff1f9b96e8569ae401892f.tar.xz | |
(svn r16242) -Codechange: rework pausing
-Fix [FS#2864]: autopause and manual pausing conflict with eachother
-Fix: new game + pause on new game + autopause make the game not unpause on the first join
Diffstat (limited to 'src/saveload/afterload.cpp')
| -rw-r--r-- | src/saveload/afterload.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index 7dca7a53a..87a5c9910 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -336,6 +336,10 @@ bool AfterLoadGame() if (CheckSavegameVersion(98)) GamelogGRFAddList(_grfconfig); + if (CheckSavegameVersion(119)) { + _pause_mode = (_pause_mode == 2) ? PM_PAUSED_NORMAL : PM_UNPAUSED; + } + /* in very old versions, size of train stations was stored differently */ if (CheckSavegameVersion(2)) { Station *st; @@ -440,7 +444,7 @@ bool AfterLoadGame() switch (gcf_res) { case GLC_COMPATIBLE: _switch_mode_errorstr = STR_NEWGRF_COMPATIBLE_LOAD_WARNING; break; - case GLC_NOT_FOUND: _switch_mode_errorstr = STR_NEWGRF_DISABLED_WARNING; _pause_game = -1; break; + case GLC_NOT_FOUND: _switch_mode_errorstr = STR_NEWGRF_DISABLED_WARNING; _pause_mode = PM_PAUSED_ERROR; break; default: break; } |