diff options
author | Paul Gilbert | 2016-06-22 20:43:54 -0400 |
---|---|---|
committer | Paul Gilbert | 2016-07-15 19:24:04 -0400 |
commit | 452274dae027933b2199cd26236f1a5e908c4275 (patch) | |
tree | a5fe0f1e8ccc2b20cb00e33e24be8f7b302d4341 /engines/titanic/pet_control/pet_rooms_glyphs.h | |
parent | 5aff1d01b4088979e207c434476fa7ca3f6a644f (diff) | |
download | scummvm-rg350-452274dae027933b2199cd26236f1a5e908c4275.tar.gz scummvm-rg350-452274dae027933b2199cd26236f1a5e908c4275.tar.bz2 scummvm-rg350-452274dae027933b2199cd26236f1a5e908c4275.zip |
TITANIC: Flesh out PET Rooms adding glyphs
Diffstat (limited to 'engines/titanic/pet_control/pet_rooms_glyphs.h')
-rw-r--r-- | engines/titanic/pet_control/pet_rooms_glyphs.h | 54 |
1 files changed, 33 insertions, 21 deletions
diff --git a/engines/titanic/pet_control/pet_rooms_glyphs.h b/engines/titanic/pet_control/pet_rooms_glyphs.h index c48011f347..1d6ded7af9 100644 --- a/engines/titanic/pet_control/pet_rooms_glyphs.h +++ b/engines/titanic/pet_control/pet_rooms_glyphs.h @@ -47,27 +47,6 @@ public: CPetRoomsGlyph(uint flags); /** - * Set the room flags for the glyph - */ - void setFoomFlags(uint flags) { _roomFlags = flags; } - - /** - * Get the room flags for the glyph - */ - uint getRoomFlags() const { return _roomFlags; } - - void set38(int val) { _field38 = val; } - - /** - * Sets the mode of the glyph - */ - void setMode(RoomGlyphMode mode) { _mode = mode; } - - bool isModeValid() const { return _mode != RGM_0; } - bool isMode1() const { return _mode == RGM_1; } - bool isMode2() const { return _mode == RGM_2; } - - /** * Setup the glyph */ virtual bool setup(CPetControl *petControl, CPetGlyphs *owner); @@ -94,6 +73,28 @@ public: virtual int proc33(); virtual void proc39(); + + + /** + * Set the room flags for the glyph + */ + void setFoomFlags(uint flags) { _roomFlags = flags; } + + /** + * Get the room flags for the glyph + */ + uint getRoomFlags() const { return _roomFlags; } + + void set38(int val) { _field38 = val; } + + /** + * Sets the mode of the glyph + */ + void setMode(RoomGlyphMode mode) { _mode = mode; } + + bool isModeValid() const { return _mode != RGM_0; } + bool isMode1() const { return _mode == RGM_1; } + bool isMode2() const { return _mode == RGM_2; } }; class CPetRoomsGlyphs : public CPetGlyphs { @@ -105,6 +106,17 @@ public: void save2(SimpleFile *file, int indent) const; CPetRoomsGlyph *findMode1() const; + + + /** + * Finds a glyph in the list by it's room flags + */ + CPetRoomsGlyph *findGlyphByFlags(uint flags) const; + + /** + * Returns true if there's a glyph in the list with a given room flags + */ + bool hasFlags(uint flags) const { return findGlyphByFlags(flags) != nullptr; } }; } // End of namespace Titanic |