diff options
| author | Gregory Montoir | 2003-11-16 20:31:14 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2003-11-16 20:31:14 +0000 |
| commit | a169876a2f450eb022fb35ad16f3546ee4003f38 (patch) | |
| tree | b226e21f4404251277d376736cc4498fc5178263 /queen | |
| parent | ba50b42c36d54e5f37987ae13621d2108ae873b9 (diff) | |
| download | scummvm-rg350-a169876a2f450eb022fb35ad16f3546ee4003f38.tar.gz scummvm-rg350-a169876a2f450eb022fb35ad16f3546ee4003f38.tar.bz2 scummvm-rg350-a169876a2f450eb022fb35ad16f3546ee4003f38.zip | |
Apparently, my previous fix (joe position when switching room) causes trouble when returning from a cutaway with initialRoom != currentRoom. I added a condition, but that's not exactly like the original. Maybe one effect of the missing SETUP_ROOM call in cutaway code.
svn-id: r11314
Diffstat (limited to 'queen')
| -rw-r--r-- | queen/cutaway.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/queen/cutaway.cpp b/queen/cutaway.cpp index 53acb35dd4..c6e966c52b 100644 --- a/queen/cutaway.cpp +++ b/queen/cutaway.cpp @@ -1337,8 +1337,9 @@ void Cutaway::run(char *nextFilename) { restorePersonData(); debug(0, "_logic->entryObj() = %i", _logic->entryObj()); - if (_logic->entryObj() > 0) + if (_logic->entryObj() > 0) { _initialRoom = _logic->objectData(_logic->entryObj())->room; + } else { // We're not returning to new room, so return to old Joe X,Y coords debug(0, "[Cutaway::run] Moving joe to (%i, %i)", initialJoeX, initialJoeY); @@ -1354,8 +1355,10 @@ void Cutaway::run(char *nextFilename) { _logic->newRoom(_initialRoom); _logic->display()->fullscreen(true); } - _logic->joeX(0); - _logic->joeY(0); + else { + _logic->joeX(0); + _logic->joeY(0); + } } // XXX CUTJOEF=0; |