aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/core
diff options
context:
space:
mode:
authorPaul Gilbert2016-08-02 19:27:00 -0400
committerPaul Gilbert2016-08-02 19:27:00 -0400
commit99b353b9fef51eccbf88b1bfa8a69381369dfd50 (patch)
treea856aa3f2d725c5ee8caa9f0f9b5d8887843785a /engines/titanic/core
parent17762761fe01b467bf2df2e33b3d7293eb40c26c (diff)
downloadscummvm-rg350-99b353b9fef51eccbf88b1bfa8a69381369dfd50.tar.gz
scummvm-rg350-99b353b9fef51eccbf88b1bfa8a69381369dfd50.tar.bz2
scummvm-rg350-99b353b9fef51eccbf88b1bfa8a69381369dfd50.zip
TITANIC: Added CPETPosition enterViewMsg
Diffstat (limited to 'engines/titanic/core')
-rw-r--r--engines/titanic/core/game_object.cpp14
-rw-r--r--engines/titanic/core/game_object.h11
2 files changed, 16 insertions, 9 deletions
diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index 39e4f8412e..3ee3254f1c 100644
--- a/engines/titanic/core/game_object.cpp
+++ b/engines/titanic/core/game_object.cpp
@@ -1371,11 +1371,6 @@ void CGameObject::petDisplayMessage(const CString &msg) {
pet->displayMessage(msg);
}
-int CGameObject::petGetRooms1D0() const {
- CPetControl *petControl = getPetControl();
- return petControl ? petControl->getRooms1D0() : 0;
-}
-
void CGameObject::petInvChange() {
CPetControl *pet = getPetControl();
if (pet)
@@ -1406,10 +1401,15 @@ void CGameObject::petSetArea(PetArea newArea) const {
pet->setArea(newArea);
}
-void CGameObject::petSetRooms1D0(int val) {
+void CGameObject::petSetRoomsWellEntry(int entryNum) {
CPetControl *petControl = getPetControl();
if (petControl)
- petControl->setRooms1D0(val);
+ petControl->setRoomsWellEntry(entryNum);
+}
+
+int CGameObject::petGetRoomsWellEntry() const {
+ CPetControl *petControl = getPetControl();
+ return petControl ? petControl->getRoomsWellEntry() : 0;
}
void CGameObject::petSetRooms1D4(int v) {
diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h
index 69036b1690..048c1668d4 100644
--- a/engines/titanic/core/game_object.h
+++ b/engines/titanic/core/game_object.h
@@ -744,7 +744,10 @@ public:
*/
void petDisplayMessage(const CString &msg);
- int petGetRooms1D0() const;
+ /**
+ * Gets the entry number used when last arriving at the well
+ */
+ int petGetRoomsWellEntry() const;
/**
* Hide the PET
@@ -786,7 +789,11 @@ public:
*/
void petSetRemoteTarget();
- void petSetRooms1D0(int val);
+ /**
+ * Sets the entry number for arriving at the well
+ */
+ void petSetRoomsWellEntry(int entryNum);
+
void petSetRooms1D4(int v);