Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- scenario pause command should work in network mode

This commit is contained in:
Mark Vejvoda 2011-12-28 07:26:16 +00:00
parent 61bebd6b86
commit ec2f889a76
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/glest_game/game/script_manager.cpp
View File

@ -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) {

4
source/glest_game/world/world.cpp
View File

@ -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) {

2
source/glest_game/world/world.h
View File

@ -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);