diff options
| author | David Eriksson | 2003-11-10 12:21:10 +0000 |
|---|---|---|
| committer | David Eriksson | 2003-11-10 12:21:10 +0000 |
| commit | cd4eb7deffbd72f3fc4a80a242f06b9dae5270a6 (patch) | |
| tree | f45a4f97190ce20d99f62e6de04cc3e652e02917 /queen | |
| parent | 6fec54b411824e778a0f5ec7dfd203d7c39d3802 (diff) | |
| download | scummvm-rg350-cd4eb7deffbd72f3fc4a80a242f06b9dae5270a6.tar.gz scummvm-rg350-cd4eb7deffbd72f3fc4a80a242f06b9dae5270a6.tar.bz2 scummvm-rg350-cd4eb7deffbd72f3fc4a80a242f06b9dae5270a6.zip | |
Return mouse cursor and panel after cutaway.
svn-id: r11247
Diffstat (limited to 'queen')
| -rw-r--r-- | queen/cutaway.cpp | 6 | ||||
| -rw-r--r-- | queen/logic.cpp | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/queen/cutaway.cpp b/queen/cutaway.cpp index 24066ea158..7b32566172 100644 --- a/queen/cutaway.cpp +++ b/queen/cutaway.cpp @@ -99,6 +99,7 @@ void Cutaway::load(const char *filename) { _comPanel = READ_BE_UINT16(ptr); ptr += 2; + debug(0, "_comPanel = %i", _comPanel); _cutawayObjectCount = (int16)READ_BE_UINT16(ptr); ptr += 2; @@ -1305,7 +1306,10 @@ void Cutaway::run(char *nextFilename) { talk(nextFilename); - if (_comPanel == 0 || (_comPanel == 2 && !_anotherCutaway)) { + // XXX removed the condition because otherwise sceneStop is not always + // executed in pair with sceneStart. */ + + if (_comPanel == 0 || (_comPanel == 2 /*&& !_anotherCutaway*/)) { _logic->sceneStop(true); _comPanel = 0; } diff --git a/queen/logic.cpp b/queen/logic.cpp index 33d8020835..735bd088f8 100644 --- a/queen/logic.cpp +++ b/queen/logic.cpp @@ -2496,6 +2496,7 @@ bool Logic::gameLoad(uint16 slot) { } void Logic::sceneStart(bool showMouseCursor) { + debug(0, "[Logic::sceneStart] _scene = %i", _scene); _scene++; _display->mouseCursorShow(showMouseCursor); @@ -2509,6 +2510,7 @@ void Logic::sceneStart(bool showMouseCursor) { } void Logic::sceneStop(bool showMouseCursor) { + debug(0, "[Logic::sceneStop] _scene = %i", _scene); _scene--; if (_scene > 0) |