From ec2f889a76d585e848150e7c70a17a0f6564a4d9 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Wed, 28 Dec 2011 07:26:16 +0000 Subject: [PATCH] - scenario pause command should work in network mode --- source/glest_game/game/script_manager.cpp | 2 +- source/glest_game/world/world.cpp | 4 ++-- source/glest_game/world/world.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/glest_game/game/script_manager.cpp b/source/glest_game/game/script_manager.cpp index 3c28b7c76..e6dd2dc6c 100644 --- a/source/glest_game/game/script_manager.cpp +++ b/source/glest_game/game/script_manager.cpp @@ -610,7 +610,7 @@ void ScriptManager::stopAllSound() { void ScriptManager::togglePauseGame(int pauseStatus) { if(SystemFlags::getSystemSettingType(SystemFlags::debugLUA).enabled) SystemFlags::OutputDebug(SystemFlags::debugLUA,"In [%s::%s Line: %d] pauseStatus = %d\n",__FILE__,__FUNCTION__,__LINE__,pauseStatus); ScriptManager_STREFLOP_Wrapper streflopWrapper; - world->togglePauseGame((pauseStatus != 0)); + world->togglePauseGame((pauseStatus != 0),true); } void ScriptManager::morphToUnit(int unitId,const string &morphName, int ignoreRequirements) { diff --git a/source/glest_game/world/world.cpp b/source/glest_game/world/world.cpp index ef4068f0a..db230e286 100644 --- a/source/glest_game/world/world.cpp +++ b/source/glest_game/world/world.cpp @@ -1071,8 +1071,8 @@ void World::moveToUnit(int unitId, int destUnitId) { } } -void World::togglePauseGame(bool pauseStatus) { - game->setPaused(pauseStatus); +void World::togglePauseGame(bool pauseStatus,bool forceAllowPauseStateChange) { + game->setPaused(pauseStatus, forceAllowPauseStateChange); } void World::addConsoleText(const string &text) { diff --git a/source/glest_game/world/world.h b/source/glest_game/world/world.h index 8baa167c8..47138b40b 100644 --- a/source/glest_game/world/world.h +++ b/source/glest_game/world/world.h @@ -227,7 +227,7 @@ public: void stopStreamingSound(const string &playSound); void stopAllSound(); void moveToUnit(int unitId, int destUnitId); - void togglePauseGame(bool pauseStatus); + void togglePauseGame(bool pauseStatus, bool forceAllowPauseStateChange); void addConsoleText(const string &text); void addConsoleTextWoLang(const string &text);