From b6f476c70f90dd451e7e931fe91ce7c86b922b20 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 26 Jun 2016 17:52:42 -0400 Subject: TITANIC: Cleanup and renamings for PET Starfield controller --- engines/titanic/pet_control/pet_control.cpp | 12 ++++----- engines/titanic/pet_control/pet_control.h | 2 +- engines/titanic/pet_control/pet_starfield.cpp | 39 ++++++++++++++------------- engines/titanic/pet_control/pet_starfield.h | 8 +++--- 4 files changed, 31 insertions(+), 30 deletions(-) (limited to 'engines') diff --git a/engines/titanic/pet_control/pet_control.cpp b/engines/titanic/pet_control/pet_control.cpp index b6648b9661..793436521c 100644 --- a/engines/titanic/pet_control/pet_control.cpp +++ b/engines/titanic/pet_control/pet_control.cpp @@ -51,7 +51,7 @@ CPetControl::CPetControl() : CGameObject(), _sections[PET_REMOTE] = &_remote; _sections[PET_ROOMS] = &_rooms; _sections[PET_REAL_LIFE] = &_realLife; - _sections[PET_STARFIELD] = &_navHelmet; + _sections[PET_STARFIELD] = &_starfield; _sections[PET_MESSAGE] = &_message; } @@ -85,7 +85,7 @@ void CPetControl::setup() { _rooms.setup(this); _remote.setup(this); _inventory.setup(this); - _navHelmet.setup(this); + _starfield.setup(this); _realLife.setup(this); _message.setup(this); _frame.setup(this); @@ -96,7 +96,7 @@ bool CPetControl::isValid() { _rooms.isValid(this) && _remote.isValid(this) && _inventory.isValid(this) && - _navHelmet.isValid(this) && + _starfield.isValid(this) && _realLife.isValid(this) && _message.isValid(this) && _frame.isValid(this); @@ -107,7 +107,7 @@ void CPetControl::loadAreas(SimpleFile *file, int param) { _rooms.load(file, param); _remote.load(file, param); _inventory.load(file, param); - _navHelmet.load(file, param); + _starfield.load(file, param); _realLife.load(file, param); _message.load(file, param); _frame.load(file, param); @@ -118,7 +118,7 @@ void CPetControl::saveAreas(SimpleFile *file, int indent) const { _rooms.save(file, indent); _remote.save(file, indent); _inventory.save(file, indent); - _navHelmet.save(file, indent); + _starfield.save(file, indent); _realLife.save(file, indent); _message.save(file, indent); _frame.save(file, indent); @@ -163,7 +163,7 @@ void CPetControl::loaded() { _rooms.postLoad(); _remote.postLoad(); _inventory.postLoad(); - _navHelmet.postLoad(); + _starfield.postLoad(); _realLife.postLoad(); _message.postLoad(); _frame.postLoad(); diff --git a/engines/titanic/pet_control/pet_control.h b/engines/titanic/pet_control/pet_control.h index d03f1c5efb..e389a0e31a 100644 --- a/engines/titanic/pet_control/pet_control.h +++ b/engines/titanic/pet_control/pet_control.h @@ -56,7 +56,7 @@ private: CPetSection *_sections[7]; CPetConversations _conversations; CPetInventory _inventory; - CPetStarfield _navHelmet; + CPetStarfield _starfield; CPetRemote _remote; CPetRooms _rooms; CPetRealLife _realLife; diff --git a/engines/titanic/pet_control/pet_starfield.cpp b/engines/titanic/pet_control/pet_starfield.cpp index f657d9b4ff..4230d9454f 100644 --- a/engines/titanic/pet_control/pet_starfield.cpp +++ b/engines/titanic/pet_control/pet_starfield.cpp @@ -40,11 +40,11 @@ bool CPetStarfield::setup(CPetControl *petControl) { bool CPetStarfield::reset() { if (_petControl) { - _val1.setup(MODE_UNSELECTED, "3PetStarField", _petControl); - _val2.setup(MODE_UNSELECTED, "HomePhotoOnOff", _petControl); - _setDestination.setup(MODE_UNSELECTED, "3PetSetDestin", _petControl); - _setDestination.setup(MODE_SELECTED, "3PetSetDestin1", _petControl); - _val4.setup(MODE_UNSELECTED, "3PetStarCtrl", _petControl); + _imgStarfield.setup(MODE_UNSELECTED, "3PetStarField", _petControl); + _imgPhoto.setup(MODE_UNSELECTED, "HomePhotoOnOff", _petControl); + _btnSetDest.setup(MODE_UNSELECTED, "3PetSetDestin", _petControl); + _btnSetDest.setup(MODE_SELECTED, "3PetSetDestin1", _petControl); + _imgStarCtrl.setup(MODE_UNSELECTED, "3PetStarCtrl", _petControl); _leds[0].setup(MODE_UNSELECTED, "LEDOff1", _petControl); _leds[1].setup(MODE_UNSELECTED, "LEDOn1", _petControl); @@ -64,13 +64,14 @@ bool CPetStarfield::reset() { void CPetStarfield::draw(CScreenManager *screenManager) { _petControl->drawSquares(screenManager, 2); + _imgStarfield.draw(screenManager); if (_photoOn) { - _val2.draw(screenManager); + _imgPhoto.draw(screenManager); } else { - _val4.draw(screenManager); + _imgStarCtrl.draw(screenManager); } - _setDestination.draw(screenManager); + _btnSetDest.draw(screenManager); drawButton(_btnOffsets[0], 0, screenManager); drawButton(_btnOffsets[1], 2, screenManager); drawButton(_btnOffsets[2], 4, screenManager); @@ -81,10 +82,10 @@ bool CPetStarfield::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { if (!_petControl->_remoteTarget) return false; - if (_val1.MouseButtonDownMsg(msg->_mousePos)) { + if (_imgStarfield.MouseButtonDownMsg(msg->_mousePos)) { CPETHelmetOnOffMsg helmetMsg; helmetMsg.execute(_petControl->_remoteTarget); - } else if (_val2.MouseButtonDownMsg(msg->_mousePos)) { + } else if (_imgPhoto.MouseButtonDownMsg(msg->_mousePos)) { if (_field210) { _photoOn = !_photoOn; CPETPhotoOnOffMsg photoMsg; @@ -92,7 +93,7 @@ bool CPetStarfield::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { } else { _petControl->displayMessage("Please supply Galactic reference material."); } - } else if (!_setDestination.MouseButtonDownMsg(msg->_mousePos)) { + } else if (!_btnSetDest.MouseButtonDownMsg(msg->_mousePos)) { return elementsMouseDown(msg); } @@ -100,7 +101,7 @@ bool CPetStarfield::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { } bool CPetStarfield::MouseButtonUpMsg(CMouseButtonUpMsg *msg) { - if (!_petControl->_remoteTarget || !_setDestination.MouseButtonUpMsg(msg->_mousePos)) + if (!_petControl->_remoteTarget || !_btnSetDest.MouseButtonUpMsg(msg->_mousePos)) return false; if (_petControl) { @@ -143,12 +144,12 @@ bool CPetStarfield::setupControl(CPetControl *petControl) { Rect r(0, 0, 64, 64); r.translate(_rect1.left, _rect1.top); - _val1.setBounds(r); - _val1.translate(15, 23); - _val2.setBounds(r); - _val2.translate(85, 23); - _val4.setBounds(r); - _val4.translate(85, 23); + _imgStarfield.setBounds(r); + _imgStarfield.translate(15, 23); + _imgPhoto.setBounds(r); + _imgPhoto.translate(85, 23); + _imgStarCtrl.setBounds(r); + _imgStarCtrl.translate(85, 23); r = Rect(0, 0, 34, 34); r.translate(468, 396); @@ -166,7 +167,7 @@ bool CPetStarfield::setupControl(CPetControl *petControl) { r = Rect(0, 0, 157, 51); r.translate(224, 33); r.translate(20, 350); - _setDestination.setBounds(r); + _btnSetDest.setBounds(r); r = Rect(0, 0, 580, 15); r.translate(32, 445); diff --git a/engines/titanic/pet_control/pet_starfield.h b/engines/titanic/pet_control/pet_starfield.h index 30766b3d82..6cfc308d24 100644 --- a/engines/titanic/pet_control/pet_starfield.h +++ b/engines/titanic/pet_control/pet_starfield.h @@ -31,10 +31,10 @@ namespace Titanic { class CPetStarfield : public CPetSection { private: - CPetGfxElement _val1; - CPetGfxElement _val2; - CPetGfxElement _setDestination; - CPetGfxElement _val4; + CPetGfxElement _imgStarfield; + CPetGfxElement _imgPhoto; + CPetGfxElement _imgStarCtrl; + CPetGfxElement _btnSetDest; int _btnOffsets[3]; CPetGfxElement _leds[6]; Rect _rect1; -- cgit v1.2.3