diff options
| author | Paul Gilbert | 2016-06-23 22:23:03 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-07-15 19:24:29 -0400 |
| commit | a4b746d24eaeba4cfd05603be2591dc3ec2d10e9 (patch) | |
| tree | 4ee3f2d11f6b68624923cbb7067511d32564b736 | |
| parent | fd2fd2cdc5e730b43510d2a6b866a9aa67c3c7d5 (diff) | |
| download | scummvm-rg350-a4b746d24eaeba4cfd05603be2591dc3ec2d10e9.tar.gz scummvm-rg350-a4b746d24eaeba4cfd05603be2591dc3ec2d10e9.tar.bz2 scummvm-rg350-a4b746d24eaeba4cfd05603be2591dc3ec2d10e9.zip | |
TITANIC: Added further PET Rooms Glyph method
| -rw-r--r-- | engines/titanic/pet_control/pet_glyphs.h | 2 | ||||
| -rw-r--r-- | engines/titanic/pet_control/pet_rooms_glyphs.cpp | 6 | ||||
| -rw-r--r-- | engines/titanic/pet_control/pet_rooms_glyphs.h | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/engines/titanic/pet_control/pet_glyphs.h b/engines/titanic/pet_control/pet_glyphs.h index f0b9ef128b..f6c4806d83 100644 --- a/engines/titanic/pet_control/pet_glyphs.h +++ b/engines/titanic/pet_control/pet_glyphs.h @@ -195,7 +195,7 @@ public: virtual void save2(SimpleFile *file, int indent) {} - virtual int proc33() { return 1; } + virtual bool proc33(CPetGlyph *glyph) { return true; } virtual int proc34() { return 1; } /** diff --git a/engines/titanic/pet_control/pet_rooms_glyphs.cpp b/engines/titanic/pet_control/pet_rooms_glyphs.cpp index 520a649688..7f6ebd6898 100644 --- a/engines/titanic/pet_control/pet_rooms_glyphs.cpp +++ b/engines/titanic/pet_control/pet_rooms_glyphs.cpp @@ -168,8 +168,10 @@ void CPetRoomsGlyph::save2(SimpleFile *file, int indent) const { file->writeNumberLine(_mode, indent); } -int CPetRoomsGlyph::proc33() { - return 1; +bool CPetRoomsGlyph::proc33(CPetGlyph *glyph) { + CPetRoomsGlyph *roomGlyph = static_cast<CPetRoomsGlyph *>(glyph); + + return proc33(glyph) && _roomFlags == roomGlyph->_roomFlags; } void CPetRoomsGlyph::loadFlags(SimpleFile *file, int val) { diff --git a/engines/titanic/pet_control/pet_rooms_glyphs.h b/engines/titanic/pet_control/pet_rooms_glyphs.h index f0b243ea7c..f3bd2d2b61 100644 --- a/engines/titanic/pet_control/pet_rooms_glyphs.h +++ b/engines/titanic/pet_control/pet_rooms_glyphs.h @@ -89,7 +89,7 @@ public: virtual void save2(SimpleFile *file, int indent) const; - virtual int proc33(); + virtual bool proc33(CPetGlyph *glyph); /** * Loads flags for the glyph |