aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Montoir2003-11-03 14:48:07 +0000
committerGregory Montoir2003-11-03 14:48:07 +0000
commitf9b7856afbd6ebc96a878707a1de5fcfdd61f070 (patch)
treeac2c6781d91143440ed5ce40f8662be817a10dce
parentac47dbeee8508a18bc062117ddd7ece5a1d699a6 (diff)
downloadscummvm-rg350-f9b7856afbd6ebc96a878707a1de5fcfdd61f070.tar.gz
scummvm-rg350-f9b7856afbd6ebc96a878707a1de5fcfdd61f070.tar.bz2
scummvm-rg350-f9b7856afbd6ebc96a878707a1de5fcfdd61f070.zip
init Walk::_joeMoveBlock at the right place
svn-id: r11091
-rw-r--r--queen/walk.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/queen/walk.cpp b/queen/walk.cpp
index b52f481bbf..055f2ddfd4 100644
--- a/queen/walk.cpp
+++ b/queen/walk.cpp
@@ -292,6 +292,7 @@ void Walk::animatePerson(const MovePersonData *mpd, uint16 image, uint16 bobNum,
int16 Walk::joeMove(int direction, uint16 endx, uint16 endy, bool inCutaway) {
+ _joeMoveBlock = false;
int16 can = 0;
initWalkData();
@@ -330,6 +331,7 @@ int16 Walk::joeMove(int direction, uint16 endx, uint16 endy, bool inCutaway) {
// XXX walkgameload=0;
if (_joeMoveBlock) {
can = -2;
+ _joeMoveBlock = false;
}
else if (direction > 0) {
_logic->joeFacing(direction);
@@ -595,7 +597,6 @@ void Walk::initWalkData() {
memset(_areaStrike, 0, sizeof(_areaStrike));
_areaListCount = 0;
memset(_areaList, 0, sizeof(_areaList));
- _joeMoveBlock = false;
}