aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/pet_control
diff options
context:
space:
mode:
Diffstat (limited to 'engines/titanic/pet_control')
-rw-r--r--engines/titanic/pet_control/pet_control.cpp2
-rw-r--r--engines/titanic/pet_control/pet_control.h10
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/titanic/pet_control/pet_control.cpp b/engines/titanic/pet_control/pet_control.cpp
index 4fe0c1d255..8376f4ac2c 100644
--- a/engines/titanic/pet_control/pet_control.cpp
+++ b/engines/titanic/pet_control/pet_control.cpp
@@ -284,7 +284,7 @@ void CPetControl::fn3(CTreeItem *item) {
CRoomItem *CPetControl::getHiddenRoom() {
if (!_hiddenRoom)
- _hiddenRoom = getHiddenRoom();
+ _hiddenRoom = CTreeItem::getHiddenRoom();
return _hiddenRoom;
}
diff --git a/engines/titanic/pet_control/pet_control.h b/engines/titanic/pet_control/pet_control.h
index 4fcfe6e7a4..ea7c6845f3 100644
--- a/engines/titanic/pet_control/pet_control.h
+++ b/engines/titanic/pet_control/pet_control.h
@@ -81,11 +81,6 @@ private:
* Scan the specified room for an item by name
*/
CGameObject *findItemInRoom(CRoomItem *room, const CString &name) const;
-
- /**
- * Returns a reference to the special hidden room container
- */
- CRoomItem *getHiddenRoom();
public:
PetArea _currentArea;
public:
@@ -150,6 +145,11 @@ public:
* special hidden room container
*/
CGameObject *getHiddenObject(const CString &name);
+
+ /**
+ * Returns a reference to the special hidden room container
+ */
+ CRoomItem *getHiddenRoom();
};
} // End of namespace Titanic