diff options
author | Paul Gilbert | 2017-08-12 11:07:25 -0400 |
---|---|---|
committer | Paul Gilbert | 2017-08-12 11:07:25 -0400 |
commit | eaab1f0472ea98294f7716d233d795fe4845cb8f (patch) | |
tree | 2be48a9556d27a9ed68572cf205380f75bb11633 /engines/titanic/pet_control | |
parent | 3cfb5bcdc534305a8e5d1b8bbd241e88eac83833 (diff) | |
download | scummvm-rg350-eaab1f0472ea98294f7716d233d795fe4845cb8f.tar.gz scummvm-rg350-eaab1f0472ea98294f7716d233d795fe4845cb8f.tar.bz2 scummvm-rg350-eaab1f0472ea98294f7716d233d795fe4845cb8f.zip |
TITANIC: Fix duplication of RealLife icons when passenger class changes
Diffstat (limited to 'engines/titanic/pet_control')
-rw-r--r-- | engines/titanic/pet_control/pet_control.cpp | 18 | ||||
-rw-r--r-- | engines/titanic/pet_control/pet_control.h | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/engines/titanic/pet_control/pet_control.cpp b/engines/titanic/pet_control/pet_control.cpp index 94430c6194..a62377bfb8 100644 --- a/engines/titanic/pet_control/pet_control.cpp +++ b/engines/titanic/pet_control/pet_control.cpp @@ -82,15 +82,15 @@ void CPetControl::load(SimpleFile *file) { CGameObject::load(file); } -void CPetControl::setup() { - _conversations.setup(this); - _rooms.setup(this); - _remote.setup(this); - _inventory.setup(this); - _starfield.setup(this); - _realLife.setup(this); - _translation.setup(this); - _frame.setup(this); +void CPetControl::reset() { + _conversations.reset(); + _rooms.reset(); + _remote.reset(); + _inventory.reset(); + _starfield.reset(); + _realLife.reset(); + _translation.reset(); + _frame.reset(); } bool CPetControl::isValid() { diff --git a/engines/titanic/pet_control/pet_control.h b/engines/titanic/pet_control/pet_control.h index a6915e6e13..35556e08d2 100644 --- a/engines/titanic/pet_control/pet_control.h +++ b/engines/titanic/pet_control/pet_control.h @@ -148,9 +148,9 @@ public: virtual Rect getBounds() const; /** - * Setups the sections within the PET + * Resets the PET, including all the sections within it */ - void setup(); + void reset(); /** * Called after loading a game has finished |