aboutsummaryrefslogtreecommitdiff
path: root/queen/command.cpp
diff options
context:
space:
mode:
authorGregory Montoir2004-01-14 14:34:05 +0000
committerGregory Montoir2004-01-14 14:34:05 +0000
commit6c78f2a6b801ae8a8efb7f9db9bf0213ce3eb759 (patch)
treeaaf89d79270a296bb9beab7d563639f20acbf260 /queen/command.cpp
parent9f8caa6889c5504edb279cacc524c142eb5829d1 (diff)
downloadscummvm-rg350-6c78f2a6b801ae8a8efb7f9db9bf0213ce3eb759.tar.gz
scummvm-rg350-6c78f2a6b801ae8a8efb7f9db9bf0213ce3eb759.tar.bz2
scummvm-rg350-6c78f2a6b801ae8a8efb7f9db9bf0213ce3eb759.zip
- tweaked a bit walking functions to make persons stop walking when a cutaway is canceled
- removed unpack to bob frame 2 (as it is never used) - changed some error() calls to assert() - minor cleanups svn-id: r12385
Diffstat (limited to 'queen/command.cpp')
-rw-r--r--queen/command.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/queen/command.cpp b/queen/command.cpp
index c278ea64b6..302db35072 100644
--- a/queen/command.cpp
+++ b/queen/command.cpp
@@ -455,8 +455,7 @@ int16 Command::makeJoeWalkTo(int16 x, int16 y, int16 objNum, Verb v, bool mustWa
if (mustWalk) {
// determine which way for Joe to face Object
uint16 facing = State::findDirection(objData->state);
-
- BobSlot *bobJoe = _vm->graphics()->bob(0);
+ BobSlot *bobJoe = _vm->graphics()->bob(0);
if (x == bobJoe->x && y == bobJoe->y) {
_vm->logic()->joeFacing(facing);
_vm->logic()->joeFace();