diff options
| author | Gregory Montoir | 2003-11-15 15:44:50 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2003-11-15 15:44:50 +0000 |
| commit | 308b5de8a67295418f3d870fb69083e60cc2b3f5 (patch) | |
| tree | 9aaa087eb8d9b190684d7ee303a484103e678454 /queen/walk.cpp | |
| parent | aaa5631a9963b02a96d5f82187465433c6b2dd13 (diff) | |
| download | scummvm-rg350-308b5de8a67295418f3d870fb69083e60cc2b3f5.tar.gz scummvm-rg350-308b5de8a67295418f3d870fb69083e60cc2b3f5.tar.bz2 scummvm-rg350-308b5de8a67295418f3d870fb69083e60cc2b3f5.zip | |
fix some bugs :
- right-clicking on inventory item doesn't execute default action
- unapplied room light level when Joe enters a room
- updated comment in roomDisplay on palette fading problem
- during dialogue, invalid mouse-overs (added enum for joeWalk flag too)
preparing Journal stuff :
- add a (almost useless) useJournal method to Logic
- removed useless code in Graphics, as it should (and could) be easily re-written in a more OO way
svn-id: r11299
Diffstat (limited to 'queen/walk.cpp')
| -rw-r--r-- | queen/walk.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/queen/walk.cpp b/queen/walk.cpp index 56fc5cb869..36da69c4ee 100644 --- a/queen/walk.cpp +++ b/queen/walk.cpp @@ -142,7 +142,7 @@ bool Walk::animateJoe() { pbs->speed = 1; } _logic->checkPlayer(); - if (_logic->joeWalk() == 2) { // XXX || cutQuit + if (_logic->joeWalk() == JWM_EXECUTE) { // XXX || cutQuit // we are about to do something else, so stop walking interrupted = true; pbs->moving = false; @@ -299,7 +299,7 @@ int16 Walk::joeMove(int direction, int16 endx, int16 endy, bool inCutaway) { uint16 oldx = _graphics->bob(0)->x; uint16 oldy = _graphics->bob(0)->y; - _logic->joeWalk(1); + _logic->joeWalk(JWM_MOVE); uint16 oldPos = _logic->zoneInArea(ZONE_ROOM, oldx, oldy); uint16 newPos = _logic->zoneInArea(ZONE_ROOM, endx, endy); |