diff options
Diffstat (limited to 'engines/titanic/room_flags.h')
| -rw-r--r-- | engines/titanic/room_flags.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/engines/titanic/room_flags.h b/engines/titanic/room_flags.h index dfb7c89d96..f0f90f80d1 100644 --- a/engines/titanic/room_flags.h +++ b/engines/titanic/room_flags.h @@ -58,25 +58,25 @@ private: */ uint decodeFloorBits(uint bits) const; + static bool is2To19(uint v) { return v >= 2 && v <= 19; } + static bool is20To27(uint v) { return v >= 20 && v <= 27; } + static bool is28To38(uint v) { return v >= 28 && v <= 38; } +public: /** - * Compares two room flags together + * Compares the current flags against the specified flags + * for a matching elevator, floor, and room */ - bool compareFlags(CRoomFlags flags1, CRoomFlags flags2) const; + static bool compareLocation(uint flags1, uint flags2); /** - * Compares the current flags against the specified flags - * for a matching elevator, floor, and room + * Compares two room flags together */ - bool compareLocation(uint roomFlags); + static bool compareClassElevator(uint flags1, uint flags2); /** * Returns true if the current flags is for Titania's room */ - bool isTitania() const { return _data == 0x8A397; } - - static bool is2To19(uint v) { return v >= 2 && v <= 19; } - static bool is20To27(uint v) { return v >= 20 && v <= 27; } - static bool is28To38(uint v) { return v >= 28 && v <= 38; } + static bool isTitania(uint flags1, uint flags2); public: CRoomFlags() : _data(0) {} CRoomFlags(uint data) : _data(data) {} |