diff options
Diffstat (limited to 'engines/titanic/pet_control')
-rw-r--r-- | engines/titanic/pet_control/pet_control_list_item.h | 4 | ||||
-rw-r--r-- | engines/titanic/pet_control/pet_control_sub10.h | 6 | ||||
-rw-r--r-- | engines/titanic/pet_control/pet_control_sub5.h | 12 | ||||
-rw-r--r-- | engines/titanic/pet_control/pet_conversation_section.h | 24 | ||||
-rw-r--r-- | engines/titanic/pet_control/pet_frame.h | 16 | ||||
-rw-r--r-- | engines/titanic/pet_control/pet_gfx_element.cpp (renamed from engines/titanic/pet_control/pet_graphic.cpp) | 14 | ||||
-rw-r--r-- | engines/titanic/pet_control/pet_gfx_element.h (renamed from engines/titanic/pet_control/pet_graphic.h) | 14 | ||||
-rw-r--r-- | engines/titanic/pet_control/pet_remote_section.h | 24 | ||||
-rw-r--r-- | engines/titanic/pet_control/pet_rooms_section.h | 2 |
9 files changed, 58 insertions, 58 deletions
diff --git a/engines/titanic/pet_control/pet_control_list_item.h b/engines/titanic/pet_control/pet_control_list_item.h index e8210714c1..caa9a0d6b1 100644 --- a/engines/titanic/pet_control/pet_control_list_item.h +++ b/engines/titanic/pet_control/pet_control_list_item.h @@ -24,13 +24,13 @@ #define TITANIC_PET_CONTROL_LIST_ITEM_H #include "titanic/core/list.h" -#include "titanic/pet_control/pet_graphic.h" +#include "titanic/pet_control/pet_gfx_element.h" namespace Titanic { class CPetControlListItem : public ListItem { protected: - CPetGraphic _val; + CPetGfxElement _val; int _field30; public: CPetControlListItem() : _field30(0) {} diff --git a/engines/titanic/pet_control/pet_control_sub10.h b/engines/titanic/pet_control/pet_control_sub10.h index a6f863cb15..e31937865b 100644 --- a/engines/titanic/pet_control/pet_control_sub10.h +++ b/engines/titanic/pet_control/pet_control_sub10.h @@ -37,9 +37,9 @@ protected: int _field1C; int _field20; int _field24; - CPetGraphic _val1; - CPetGraphic _val2; - CPetGraphic _val3; + CPetGfxElement _val1; + CPetGfxElement _val2; + CPetGfxElement _val3; public: CPetControlSub10(); diff --git a/engines/titanic/pet_control/pet_control_sub5.h b/engines/titanic/pet_control/pet_control_sub5.h index f82a1eb3f1..088ba6fd27 100644 --- a/engines/titanic/pet_control/pet_control_sub5.h +++ b/engines/titanic/pet_control/pet_control_sub5.h @@ -25,20 +25,20 @@ #include "titanic/pet_control/pet_section.h" #include "titanic/pet_control/pet_control_sub12.h" -#include "titanic/pet_control/pet_graphic.h" +#include "titanic/pet_control/pet_gfx_element.h" namespace Titanic { class CPetControlSub5 : public CPetSection { private: - CPetGraphic _val1; - CPetGraphic _val2; - CPetGraphic _val3; - CPetGraphic _val4; + CPetGfxElement _val1; + CPetGfxElement _val2; + CPetGfxElement _val3; + CPetGfxElement _val4; int _field98; int _field9C; int _fieldA0; - CPetGraphic _valArray1[6]; + CPetGfxElement _valArray1[6]; int _field17C; int _field18C; CPetControlSub12 _sub12; diff --git a/engines/titanic/pet_control/pet_conversation_section.h b/engines/titanic/pet_control/pet_conversation_section.h index 15d57e7272..863a0d99e2 100644 --- a/engines/titanic/pet_control/pet_conversation_section.h +++ b/engines/titanic/pet_control/pet_conversation_section.h @@ -25,24 +25,24 @@ #include "titanic/pet_control/pet_section.h" #include "titanic/pet_control/pet_control_sub12.h" -#include "titanic/pet_control/pet_graphic.h" +#include "titanic/pet_control/pet_gfx_element.h" namespace Titanic { class CPetConversationSection : public CPetSection { private: - CPetGraphic _val1; - CPetGraphic _val2; - CPetGraphic _val3; - CPetGraphic _valArray1[3]; - CPetGraphic _val4; - CPetGraphic _val5; - CPetGraphic _val6; + CPetGfxElement _val1; + CPetGfxElement _val2; + CPetGfxElement _val3; + CPetGfxElement _valArray1[3]; + CPetGfxElement _val4; + CPetGfxElement _val5; + CPetGfxElement _val6; int _field14C; - CPetGraphic _val7; - CPetGraphic _val8; - CPetGraphic _val9; - CPetGraphic _valArray2[9]; + CPetGfxElement _val7; + CPetGfxElement _val8; + CPetGfxElement _val9; + CPetGfxElement _valArray2[9]; int _field30C; CPetControlSub12 _sub1; CPetControlSub12 _sub2; diff --git a/engines/titanic/pet_control/pet_frame.h b/engines/titanic/pet_control/pet_frame.h index e307a73901..83543ef87c 100644 --- a/engines/titanic/pet_control/pet_frame.h +++ b/engines/titanic/pet_control/pet_frame.h @@ -24,7 +24,7 @@ #define TITANIC_PET_FRAME_H #include "titanic/pet_control/pet_section.h" -#include "titanic/pet_control/pet_graphic.h" +#include "titanic/pet_control/pet_gfx_element.h" namespace Titanic { @@ -32,13 +32,13 @@ class CPetFrame : public CPetSection { private: static int _indexes[6]; - CPetGraphic _modeButtons[6]; - CPetGraphic _titles[6]; - CPetGraphic _modeBackground; - CPetGraphic _val2; - CPetGraphic _val3; - CPetGraphic _background; - CPetGraphic _indent[7]; + CPetGfxElement _modeButtons[6]; + CPetGfxElement _titles[6]; + CPetGfxElement _modeBackground; + CPetGfxElement _val2; + CPetGfxElement _val3; + CPetGfxElement _background; + CPetGfxElement _indent[7]; private: /** * Called to set the owning PET instance and set some initial state diff --git a/engines/titanic/pet_control/pet_graphic.cpp b/engines/titanic/pet_control/pet_gfx_element.cpp index c9fd5f5af1..bec54b9c28 100644 --- a/engines/titanic/pet_control/pet_graphic.cpp +++ b/engines/titanic/pet_control/pet_gfx_element.cpp @@ -22,12 +22,12 @@ #include "common/textconsole.h" #include "titanic/core/game_object.h" -#include "titanic/pet_control/pet_graphic.h" +#include "titanic/pet_control/pet_element.h" #include "titanic/pet_control/pet_control.h" namespace Titanic { -void CPetGraphic::loadObject(PetElementMode mode, const CString &name, +void CPetGfxElement::setup(PetElementMode mode, const CString &name, CPetControl *petControl) { switch (mode) { case MODE_0: @@ -44,15 +44,15 @@ void CPetGraphic::loadObject(PetElementMode mode, const CString &name, } } -void CPetGraphic::proc2() { +void CPetGfxElement::setup() { error("TODO"); } -void CPetGraphic::draw(CScreenManager *screenManager) { +void CPetGfxElement::draw(CScreenManager *screenManager) { draw(screenManager, Common::Point(_bounds.left, _bounds.top)); } -void CPetGraphic::draw(CScreenManager *screenManager, const Common::Point &destPos) { +void CPetGfxElement::draw(CScreenManager *screenManager, const Common::Point &destPos) { CGameObject *obj = getObject(); if (!obj) obj = _object0; @@ -61,7 +61,7 @@ void CPetGraphic::draw(CScreenManager *screenManager, const Common::Point &destP obj->draw(screenManager, destPos); } -void CPetGraphic::getBounds(Rect *rect) { +void CPetGfxElement::getBounds(Rect *rect) { if (rect) { CGameObject *obj = getObject(); if (!obj) @@ -74,7 +74,7 @@ void CPetGraphic::getBounds(Rect *rect) { } } -CGameObject *CPetGraphic::getObject() const { +CGameObject *CPetGfxElement::getObject() const { switch (_mode) { case MODE_0: return _object0; diff --git a/engines/titanic/pet_control/pet_graphic.h b/engines/titanic/pet_control/pet_gfx_element.h index 8b9c495205..47720cf81a 100644 --- a/engines/titanic/pet_control/pet_graphic.h +++ b/engines/titanic/pet_control/pet_gfx_element.h @@ -20,29 +20,29 @@ * */ -#ifndef TITANIC_PET_GRAPHIC_H -#define TITANIC_PET_GRAPHIC_H +#ifndef TITANIC_PET_GFX_ELEMENT_H +#define TITANIC_PET_GFX_ELEMENT_H #include "titanic/pet_control/pet_element.h" namespace Titanic { -class CPetGraphic: public CPetElement { +class CPetGfxElement: public CPetElement { protected: CGameObject *_object0; CGameObject *_object1; CGameObject *_object2; public: - CPetGraphic() : CPetElement(), _object0(nullptr), _object1(nullptr), + CPetGfxElement() : CPetElement(), _object0(nullptr), _object1(nullptr), _object2(nullptr) {} /** * Load an object into the element */ - virtual void loadObject(PetElementMode mode, const CString &name, + virtual void setup(PetElementMode mode, const CString &name, CPetControl *petControl); - virtual void proc2(); + virtual void setup(); /** * Draw the item @@ -67,4 +67,4 @@ public: } // End of namespace Titanic -#endif /* TITANIC_PET_GRAPHIC_H */ +#endif /* TITANIC_PET_GFX_ELEMENT_H */ diff --git a/engines/titanic/pet_control/pet_remote_section.h b/engines/titanic/pet_control/pet_remote_section.h index 6a3d1cd429..562579dc50 100644 --- a/engines/titanic/pet_control/pet_remote_section.h +++ b/engines/titanic/pet_control/pet_remote_section.h @@ -26,24 +26,24 @@ #include "titanic/pet_control/pet_section.h" #include "titanic/pet_control/pet_control_sub10.h" #include "titanic/pet_control/pet_control_sub12.h" -#include "titanic/pet_control/pet_graphic.h" +#include "titanic/pet_control/pet_gfx_element.h" namespace Titanic { class CPetRemoteSection : public CPetSection { private: CPetControlSub10 _sub10; - CPetGraphic _val1; - CPetGraphic _val2; - CPetGraphic _val3; - CPetGraphic _val4; - CPetGraphic _val5; - CPetGraphic _val6; - CPetGraphic _val7; - CPetGraphic _val8; - CPetGraphic _val9; - CPetGraphic _val10; - CPetGraphic _val11; + CPetGfxElement _val1; + CPetGfxElement _val2; + CPetGfxElement _val3; + CPetGfxElement _val4; + CPetGfxElement _val5; + CPetGfxElement _val6; + CPetGfxElement _val7; + CPetGfxElement _val8; + CPetGfxElement _val9; + CPetGfxElement _val10; + CPetGfxElement _val11; CPetControlSub12 _sub12; public: diff --git a/engines/titanic/pet_control/pet_rooms_section.h b/engines/titanic/pet_control/pet_rooms_section.h index fc26c340cf..66c6e8cc0a 100644 --- a/engines/titanic/pet_control/pet_rooms_section.h +++ b/engines/titanic/pet_control/pet_rooms_section.h @@ -42,7 +42,7 @@ private: int _field114; int _field118; int _field11C; - CPetGraphic _val1; + CPetGfxElement _val1; CPetControlSub12 _sub12; int _field1C0; int _field1C4; |