aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/pet_control/pet_frame.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2016-04-17 21:08:42 -0400
committerPaul Gilbert2016-07-10 16:11:21 -0400
commit46a30255b0e5a7f5dad4fd032388d31a69208b62 (patch)
tree1e668339aecb1246c9ec20515b81866d81ab75d2 /engines/titanic/pet_control/pet_frame.cpp
parenta11e677494d7cb3c6b8ed2c56095873d46a00ab8 (diff)
downloadscummvm-rg350-46a30255b0e5a7f5dad4fd032388d31a69208b62.tar.gz
scummvm-rg350-46a30255b0e5a7f5dad4fd032388d31a69208b62.tar.bz2
scummvm-rg350-46a30255b0e5a7f5dad4fd032388d31a69208b62.zip
TITANIC: Seperate PET classes setup and reset methods
Diffstat (limited to 'engines/titanic/pet_control/pet_frame.cpp')
-rw-r--r--engines/titanic/pet_control/pet_frame.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/titanic/pet_control/pet_frame.cpp b/engines/titanic/pet_control/pet_frame.cpp
index 1859b0d39f..25d67fb661 100644
--- a/engines/titanic/pet_control/pet_frame.cpp
+++ b/engines/titanic/pet_control/pet_frame.cpp
@@ -35,28 +35,28 @@ CPetFrame::CPetFrame() : CPetSection() {
bool CPetFrame::setup(CPetControl *petControl) {
if (setPetControl(petControl))
- return setup();
+ return reset();
return false;
}
-bool CPetFrame::setup() {
+bool CPetFrame::reset() {
if (_petControl) {
- _background.setup("PetBackground", _petControl, MODE_UNSELECTED);
- _modeBackground.setup("PetModeBackground", _petControl, MODE_UNSELECTED);
+ _background.reset("PetBackground", _petControl, MODE_UNSELECTED);
+ _modeBackground.reset("PetModeBackground", _petControl, MODE_UNSELECTED);
for (int idx = 0; idx < 5; ++idx) {
CString resName = Common::String::format("PetMode%d", idx);
- _modeButtons[idx].setup(resName, _petControl, MODE_UNSELECTED);
+ _modeButtons[idx].reset(resName, _petControl, MODE_UNSELECTED);
}
for (int idx = 0; idx < 6; ++idx) {
CString resName = Common::String::format("3Pettitle%d", idx);
- _titles[idx].setup(resName, _petControl, MODE_UNSELECTED);
+ _titles[idx].reset(resName, _petControl, MODE_UNSELECTED);
}
for (int idx = 0; idx < 7; ++idx) {
CString resName = Common::String::format("PetIndent%d", idx);
- _indent[idx].setup(resName, _petControl, MODE_UNSELECTED);
+ _indent[idx].reset(resName, _petControl, MODE_UNSELECTED);
}
}
@@ -87,7 +87,7 @@ bool CPetFrame::isValid(CPetControl *petControl) {
}
void CPetFrame::postLoad() {
- setup();
+ reset();
}
bool CPetFrame::setPetControl(CPetControl *petControl) {