diff options
| author | Gregory Montoir | 2003-12-29 21:31:02 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2003-12-29 21:31:02 +0000 |
| commit | bb77917c7f97e1ddd304704a237a11c314706454 (patch) | |
| tree | 5602b948cd7bfdb7a7319f18e11e10ae3caae986 /queen | |
| parent | 0dd61a56b496dc77b08a3fa7e60d65f73178b5fc (diff) | |
| download | scummvm-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')
| -rw-r--r-- | queen/cutaway.cpp | 5 | ||||
| -rw-r--r-- | queen/logic.cpp | 5 |
2 files changed, 5 insertions, 5 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; } diff --git a/queen/logic.cpp b/queen/logic.cpp index 1f8ab6108b..7b36fec1bf 100644 --- a/queen/logic.cpp +++ b/queen/logic.cpp @@ -2637,9 +2637,8 @@ bool Logic::executeASM_Game(uint16 sm) { void Logic::executeSpecialMove(uint16 sm) { debug(6, "Special move: %d", sm); - if (sm) - if (!(this->*_executeASM)(sm)) - warning("unhandled / invalid special move : %d", sm); + if (!(this->*_executeASM)(sm)) + warning("unhandled / invalid special move : %d", sm); } |