aboutsummaryrefslogtreecommitdiff
path: root/queen/logic.h
diff options
context:
space:
mode:
authorGregory Montoir2003-11-15 15:44:50 +0000
committerGregory Montoir2003-11-15 15:44:50 +0000
commit308b5de8a67295418f3d870fb69083e60cc2b3f5 (patch)
tree9aaa087eb8d9b190684d7ee303a484103e678454 /queen/logic.h
parentaaa5631a9963b02a96d5f82187465433c6b2dd13 (diff)
downloadscummvm-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/logic.h')
-rw-r--r--queen/logic.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/queen/logic.h b/queen/logic.h
index ab5dda3e7d..e183efabbe 100644
--- a/queen/logic.h
+++ b/queen/logic.h
@@ -172,14 +172,14 @@ public:
uint16 joeFacing() { return _joe.facing; }
uint16 joeX() { return _joe.x; }
uint16 joeY() { return _joe.y; }
- uint16 joeWalk() { return _joe.walk; }
+ JoeWalkMode joeWalk() { return _joe.walk; }
uint16 joeScale() { return _joe.scale; }
uint16 joePrevFacing() { return _joe.prevFacing; }
void joeFacing(uint16 dir);
void joeX(uint16 x);
void joeY(uint16 y);
- void joeWalk(uint16 walking);
+ void joeWalk(JoeWalkMode walking);
void joeScale(uint16 scale);
void joePrevFacing(uint16 dir);
@@ -304,6 +304,8 @@ public:
void update();
+ void useJournal();
+
bool gameSave(uint16 slot, const char *desc);
bool gameLoad(uint16 slot);
@@ -409,7 +411,7 @@ protected:
struct {
uint16 x, y;
uint16 facing, prevFacing;
- uint16 walk;
+ JoeWalkMode walk;
uint16 scale;
} _joe;