From 2664f2a2d95dbc2122ff1f9b96e8569ae401892f Mon Sep 17 00:00:00 2001 From: rubidium Date: Wed, 6 May 2009 15:06:57 +0000 Subject: (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 --- src/misc_gui.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/misc_gui.cpp') diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp index 7208f2eb1..fc514a2ae 100644 --- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -1644,7 +1644,7 @@ public: /* pause is only used in single-player, non-editor mode, non-menu mode. It * will be unpaused in the WE_DESTROY event handler. */ if (_game_mode != GM_MENU && !_networking && _game_mode != GM_EDITOR) { - if (_pause_game >= 0) DoCommandP(0, 1, 0, CMD_PAUSE); + DoCommandP(0, PM_PAUSED_SAVELOAD, 1, CMD_PAUSE); } BuildFileList(); @@ -1683,7 +1683,7 @@ public: { /* pause is only used in single-player, non-editor mode, non menu mode */ if (!_networking && _game_mode != GM_EDITOR && _game_mode != GM_MENU) { - if (_pause_game >= 0) DoCommandP(0, 0, 0, CMD_PAUSE); + DoCommandP(0, PM_PAUSED_SAVELOAD, 0, CMD_PAUSE); } FiosFreeSavegameList(); } -- cgit v1.2.3-70-g09d2