diff options
| -rw-r--r-- | engines/titanic/core/game_object.cpp | 2 | ||||
| -rw-r--r-- | engines/titanic/pet_control/pet_control.cpp | 18 | ||||
| -rw-r--r-- | engines/titanic/pet_control/pet_control.h | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp index 1519a2de66..580509252b 100644 --- a/engines/titanic/core/game_object.cpp +++ b/engines/titanic/core/game_object.cpp @@ -1354,7 +1354,7 @@ void CGameObject::setPassengerClass(PassengerClass newClass) { // Setup the PET again, so the new class's PET background can take effect CPetControl *petControl = getPetControl(); if (petControl) - petControl->setup(); + petControl->reset(); } } 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 |