diff options
| author | Joost Peters | 2003-10-05 16:07:07 +0000 |
|---|---|---|
| committer | Joost Peters | 2003-10-05 16:07:07 +0000 |
| commit | 36ed0b1d3c662743f638fc7c9275f6952542c23d (patch) | |
| tree | 44bcf13ee9b060c3a5ef19a5dff3875cdee6c987 /queen/logic.h | |
| parent | 47e3b8f55d55530b6b6593c02d57a33d1767cd4c (diff) | |
| download | scummvm-rg350-36ed0b1d3c662743f638fc7c9275f6952542c23d.tar.gz scummvm-rg350-36ed0b1d3c662743f638fc7c9275f6952542c23d.tar.bz2 scummvm-rg350-36ed0b1d3c662743f638fc7c9275f6952542c23d.zip | |
renamed classes (we have our own namespace now) + fixed segfault in logic
svn-id: r10618
Diffstat (limited to 'queen/logic.h')
| -rw-r--r-- | queen/logic.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/queen/logic.h b/queen/logic.h index cda7413507..1aff8c58a5 100644 --- a/queen/logic.h +++ b/queen/logic.h @@ -32,11 +32,11 @@ enum { FRAME_XTRA = 2 }; -class QueenLogic { +class Logic { public: - QueenLogic(QueenResource *resource); - ~QueenLogic(); + Logic(Resource *resource); + ~Logic(); uint16 currentRoom(); void currentRoom(uint16 room); @@ -73,8 +73,8 @@ protected: uint16 *_roomData; uint16 *_sfxName; - uint16 *_objMax; - uint16 *_areaMax; + int16 *_objMax; + int16 *_areaMax; uint16 (*_objectBox)[4]; // FIXME: Box *_objectBox; uint16 (*_itemData)[5]; // FIXME: ItemData *_itemData; GraphicData *_graphicData; @@ -91,7 +91,7 @@ protected: uint16 _maxAnimatedFrame, _maxStaticFrame, _maxAnimatedFrameLen; // FMAXA, FMAX, FMAXALEN - QueenResource *_resource; + Resource *_resource; void initialise(); }; |