diff options
| author | Paul Gilbert | 2011-05-29 21:02:06 +1000 |
|---|---|---|
| committer | Paul Gilbert | 2011-05-30 20:29:13 +1000 |
| commit | ed20f18d29fa6fcfa682c74530515e26a94aef29 (patch) | |
| tree | a7327a98b14fd03a414f4af1e31ce0f8d94c762a /engines/m4/globals.h | |
| parent | 7f8a69d6fc44ca5515a91f29ce5451c12f85daa5 (diff) | |
| download | scummvm-rg350-ed20f18d29fa6fcfa682c74530515e26a94aef29.tar.gz scummvm-rg350-ed20f18d29fa6fcfa682c74530515e26a94aef29.tar.bz2 scummvm-rg350-ed20f18d29fa6fcfa682c74530515e26a94aef29.zip | |
TSAGE: General cleanup of object class
Diffstat (limited to 'engines/m4/globals.h')
| -rw-r--r-- | engines/m4/globals.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/engines/m4/globals.h b/engines/m4/globals.h index a95e5169be..ae2941c169 100644 --- a/engines/m4/globals.h +++ b/engines/m4/globals.h @@ -177,13 +177,14 @@ public: MadsObject() {} MadsObject(Common::SeekableReadStream *stream); void load(Common::SeekableReadStream *stream); - bool isInInventory() const { return roomNumber == PLAYER_INVENTORY; } - - uint16 descId; - uint16 roomNumber; - MADSArticles article; - uint8 vocabCount; - VocabEntry vocabList[3]; + bool isInInventory() const { return _roomNumber == PLAYER_INVENTORY; } + void setRoom(int roomNumber); + + uint16 _descId; + uint16 _roomNumber; + MADSArticles _article; + uint8 _vocabCount; + VocabEntry _vocabList[3]; }; typedef Common::Array<Common::SharedPtr<MadsObject> > MadsObjectArray; |