diff options
| author | Joost Peters | 2003-10-06 13:20:29 +0000 |
|---|---|---|
| committer | Joost Peters | 2003-10-06 13:20:29 +0000 |
| commit | 633fb7de0fcaaaaa6435223bbd18217fec79d65c (patch) | |
| tree | 850f526c2c6b0a0b4863aedd013c3b3db7ee6a68 /queen/logic.h | |
| parent | 5a1bd7574afa9e094a138c7b4e4eb17c196cd61b (diff) | |
| download | scummvm-rg350-633fb7de0fcaaaaa6435223bbd18217fec79d65c.tar.gz scummvm-rg350-633fb7de0fcaaaaa6435223bbd18217fec79d65c.tar.bz2 scummvm-rg350-633fb7de0fcaaaaa6435223bbd18217fec79d65c.zip | |
some additions + small readability rewrite
svn-id: r10638
Diffstat (limited to 'queen/logic.h')
| -rw-r--r-- | queen/logic.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/queen/logic.h b/queen/logic.h index 1aff8c58a5..0323ed1ea9 100644 --- a/queen/logic.h +++ b/queen/logic.h @@ -51,7 +51,7 @@ public: int16 *area(int index, int subIndex); uint16 walkOffCount(); - uint16 *walkOffData(int index); + WalkOffData *walkOffData(int index); int16 gameState(int index); void gameState(int index, int16 newValue); @@ -70,19 +70,21 @@ protected: uint16 _numObjectBoxes; uint16 _numWalkOffs; + uint16 _numObjDesc; uint16 *_roomData; uint16 *_sfxName; int16 *_objMax; int16 *_areaMax; - uint16 (*_objectBox)[4]; // FIXME: Box *_objectBox; - uint16 (*_itemData)[5]; // FIXME: ItemData *_itemData; + Box *_objectBox; + ItemData *_itemData; GraphicData *_graphicData; ObjectData *_objectData; + ObjectDescription *_objectDescription; uint16 (*_actorData)[12]; // FIXME: ActorData *_actorData; int16 (*_area)[11][8]; // FIXME: Area *_area[11]; - uint16 (*_walkOffData)[3]; // FIXME: WalkOffData *_walkOffData; - + WalkOffData *_walkOffData; + enum { GAME_STATE_COUNT = 211 }; |