aboutsummaryrefslogtreecommitdiff
path: root/queen/cutaway.cpp
diff options
context:
space:
mode:
authorGregory Montoir2003-12-29 21:31:02 +0000
committerGregory Montoir2003-12-29 21:31:02 +0000
commitbb77917c7f97e1ddd304704a237a11c314706454 (patch)
tree5602b948cd7bfdb7a7319f18e11e10ae3caae986 /queen/cutaway.cpp
parent0dd61a56b496dc77b08a3fa7e60d65f73178b5fc (diff)
downloadscummvm-rg350-bb77917c7f97e1ddd304704a237a11c314706454.tar.gz
scummvm-rg350-bb77917c7f97e1ddd304704a237a11c314706454.tar.bz2
scummvm-rg350-bb77917c7f97e1ddd304704a237a11c314706454.zip
only call Logic::executeSpecialMove if asm > 0
svn-id: r12023
Diffstat (limited to 'queen/cutaway.cpp')
-rw-r--r--queen/cutaway.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/queen/cutaway.cpp b/queen/cutaway.cpp
index 25c8588b92..a7a9615a02 100644
--- a/queen/cutaway.cpp
+++ b/queen/cutaway.cpp
@@ -884,7 +884,7 @@ void Cutaway::run(char *nextFilename) {
if (!object.moveToX &&
!object.moveToY &&
- object.specialMove &&
+ object.specialMove > 0 &&
object.objectNumber >= 0) {
_vm->logic()->executeSpecialMove(object.specialMove);
object.specialMove = 0;
@@ -1178,7 +1178,8 @@ void Cutaway::stop() {
} // for()
int16 specialMove = (int16)READ_BE_UINT16(ptr); ptr += 2;
- _vm->logic()->executeSpecialMove(specialMove);
+ if (specialMove > 0)
+ _vm->logic()->executeSpecialMove(specialMove);
_lastSong = (int16)READ_BE_UINT16(ptr); ptr += 2;
}