diff options
| author | Gregory Montoir | 2003-10-15 08:46:04 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2003-10-15 08:46:04 +0000 |
| commit | 8c0496194a19bc7e2f8e974863b94d7785b1fad5 (patch) | |
| tree | 2ff8599d901c661e963afd597c59a697539c1895 /queen/walk.cpp | |
| parent | 8b42d65a7e922a9b9241ebe509968331fe958fb6 (diff) | |
| download | scummvm-rg350-8c0496194a19bc7e2f8e974863b94d7785b1fad5.tar.gz scummvm-rg350-8c0496194a19bc7e2f8e974863b94d7785b1fad5.tar.bz2 scummvm-rg350-8c0496194a19bc7e2f8e974863b94d7785b1fad5.zip | |
fix personMove / cutaway problem
svn-id: r10807
Diffstat (limited to 'queen/walk.cpp')
| -rw-r--r-- | queen/walk.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/queen/walk.cpp b/queen/walk.cpp index 2205f27b6f..775593d080 100644 --- a/queen/walk.cpp +++ b/queen/walk.cpp @@ -26,6 +26,7 @@ namespace Queen { + const MovePersonData Walk::_moveData[] = { {"COMPY", -1, -6, 1, 6, 0, 0, 0, 0,12,12,1,14}, {"DEINO", -1, -8, 1, 8, 0, 0, 0, 0,11,11,1,10}, @@ -299,8 +300,6 @@ void Walk::animatePerson(const MovePersonData *mpd, uint16 image, uint16 bobNum, } - - void Walk::joeMove(int direction, uint16 endx, uint16 endy, bool inCutaway) { // CAN=0 @@ -341,9 +340,13 @@ void Walk::joeMove(int direction, uint16 endx, uint16 endy, bool inCutaway) { } - void Walk::personMove(const Person *pp, uint16 endx, uint16 endy, uint16 curImage, int direction) { + if (endx == 0 && endy == 0) { + warning("Walk::personMove() - endx == 0 && endy == 0"); + return; + } + // TODO: room 69 specific // CAN = 0; @@ -571,7 +574,6 @@ bool Walk::calcPath(uint16 oldArea, uint16 newArea) { } } } - // CAN = -1 if no connection is made, else 0 return _areaList[1] != 0; } @@ -602,5 +604,4 @@ void Walk::incWalkData(uint16 px, uint16 py, uint16 x, uint16 y, uint16 area) { } - } // End of namespace Queen |