aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/pet_control/pet_control.h
diff options
context:
space:
mode:
authorPaul Gilbert2016-03-29 21:57:09 -0400
committerPaul Gilbert2016-03-29 21:57:09 -0400
commite0602c4851ab42763cc66858fed8d05496040498 (patch)
tree30f19c267243e163c2c4cc8e9c8478507e2211da /engines/titanic/pet_control/pet_control.h
parent8a45f47c2e1e483b5a17b2d4abe22473eaf1e143 (diff)
downloadscummvm-rg350-e0602c4851ab42763cc66858fed8d05496040498.tar.gz
scummvm-rg350-e0602c4851ab42763cc66858fed8d05496040498.tar.bz2
scummvm-rg350-e0602c4851ab42763cc66858fed8d05496040498.zip
TITANIC: More PET renaming, implemented setArea
Diffstat (limited to 'engines/titanic/pet_control/pet_control.h')
-rw-r--r--engines/titanic/pet_control/pet_control.h18
1 files changed, 14 insertions, 4 deletions
diff --git a/engines/titanic/pet_control/pet_control.h b/engines/titanic/pet_control/pet_control.h
index d6fc9d01a2..ce40eba177 100644
--- a/engines/titanic/pet_control/pet_control.h
+++ b/engines/titanic/pet_control/pet_control.h
@@ -30,8 +30,8 @@
#include "titanic/pet_control/pet_inventory_section.h"
#include "titanic/pet_control/pet_remote_section.h"
#include "titanic/pet_control/pet_rooms_section.h"
+#include "titanic/pet_control/pet_save_section.h"
#include "titanic/pet_control/pet_control_sub5.h"
-#include "titanic/pet_control/pet_control_sub6.h"
#include "titanic/pet_control/pet_control_sub7.h"
#include "titanic/pet_control/pet_control_sub8.h"
@@ -39,16 +39,16 @@ namespace Titanic {
class CPetControl : public CGameObject {
private:
- int _fieldBC;
+ PetArea _currentArea;
int _fieldC0;
- int _fieldC4;
+ int _locked;
int _fieldC8;
CPetConversationSection _convSection;
CPetInventorySection _invSection;
CPetRemoteSection _remoteSection;
CPetRoomsSection _roomsSection;
+ CPetSaveSection _saveSection;
CPetControlSub5 _sub5;
- CPetControlSub6 _sub6;
CPetControlSub7 _sub7;
CPetControlSub8 _sub8;
int _field1384;
@@ -107,6 +107,16 @@ public:
void fn3(int val);
void fn4();
+
+ /**
+ * Sets the currently viewed area within the PET
+ */
+ PetArea setArea(PetArea newSection);
+
+ /**
+ * Returns true if the current area can be changed
+ */
+ bool canChangeArea() const { return _locked == 0; }
};
} // End of namespace Titanic