aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2013-08-11 23:56:14 +0300
committerEugene Sandulenko2013-09-06 14:51:13 +0300
commit687d0624e57177322c64bc660132c4c017a6e9f0 (patch)
tree3f6a6dd55f184b2f910988f3bc9c7bbdf29a7c6b
parentf90371ebceb987455a21d4358d1421e8cffb4f42 (diff)
downloadscummvm-rg350-687d0624e57177322c64bc660132c4c017a6e9f0.tar.gz
scummvm-rg350-687d0624e57177322c64bc660132c4c017a6e9f0.tar.bz2
scummvm-rg350-687d0624e57177322c64bc660132c4c017a6e9f0.zip
FULLPIPE: Fix stupid bug with not processed messages
-rw-r--r--engines/fullpipe/fullpipe.cpp8
-rw-r--r--engines/fullpipe/fullpipe.h2
-rw-r--r--engines/fullpipe/scenes.cpp1
3 files changed, 6 insertions, 5 deletions
diff --git a/engines/fullpipe/fullpipe.cpp b/engines/fullpipe/fullpipe.cpp
index bca025770b..740c2c2788 100644
--- a/engines/fullpipe/fullpipe.cpp
+++ b/engines/fullpipe/fullpipe.cpp
@@ -80,7 +80,7 @@ FullpipeEngine::FullpipeEngine(OSystem *syst, const ADGameDescription *gameDesc)
_inputArFlag = false;
_recordEvents = false;
- _flgSavegameMenuRequested = false;
+ _flgGameIsRunning = true;
_isProcessingMessages = false;
@@ -222,7 +222,7 @@ void FullpipeEngine::updateEvents() {
case Common::KEYCODE_s:
if (_gamePaused) {
_gamePaused = 0;
- _flgSavegameMenuRequested = true;
+ _flgGameIsRunning = true;
return;
}
@@ -318,8 +318,8 @@ void FullpipeEngine::updateScreen() {
//if (inputArFlag)
// updateGame_inputArFlag();
- if (_modalObject || _flgSavegameMenuRequested && (_gameLoader->updateSystems(42), _modalObject != 0)) {
- if (_flgSavegameMenuRequested) {
+ if (_modalObject || _flgGameIsRunning && (_gameLoader->updateSystems(42), _modalObject != 0)) {
+ if (_flgGameIsRunning) {
if (_modalObject->init(42)) {
_modalObject->update();
} else {
diff --git a/engines/fullpipe/fullpipe.h b/engines/fullpipe/fullpipe.h
index ac9cb856d8..404a70a7e1 100644
--- a/engines/fullpipe/fullpipe.h
+++ b/engines/fullpipe/fullpipe.h
@@ -110,7 +110,7 @@ public:
bool _updateFlag;
bool _flgCanOpenMap;
bool _gamePaused;
- bool _flgSavegameMenuRequested;
+ bool _flgGameIsRunning;
bool _inputArFlag;
bool _recordEvents;
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index f7aa525ad3..d2160b7264 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -837,6 +837,7 @@ int global_messageHandler3(ExCommand *cmd) {
int global_messageHandler4(ExCommand *cmd) {
StaticANIObject *ani = 0;
+ debug(0, "global_messageHandler4: %d %d", cmd->_messageKind, cmd->_messageNum);
switch (cmd->_messageKind) {
case 18: {
MessageQueue *mq = new MessageQueue(g_fullpipe->_currentScene->getMessageQueueById(cmd->_messageNum), cmd->_parId, 0);