aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/core/game_object.h
diff options
context:
space:
mode:
Diffstat (limited to 'engines/titanic/core/game_object.h')
-rw-r--r--engines/titanic/core/game_object.h30
1 files changed, 20 insertions, 10 deletions
diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h
index d372b40f88..67bf13141d 100644
--- a/engines/titanic/core/game_object.h
+++ b/engines/titanic/core/game_object.h
@@ -196,11 +196,6 @@ protected:
int compareRoomNameTo(const CString &name);
/**
- * Display a message
- */
- void displayMessage(const CString &msg) const;
-
- /**
* Gets the first object under the system MailMan
*/
CGameObject *getMailManFirstObject() const;
@@ -211,14 +206,19 @@ protected:
CGameObject *getMailManNextObject(CGameObject *prior) const;
/**
- * Finds an object by name within the object's room
+ * Find mail by room flags
*/
- CGameObject *findRoomObject(const CString &name) const;
+ CGameObject *findMailByFlags(int mode, uint roomFlags);
/**
- * Scan the specified room for an item by name
+ * Find next mail from a given prior one
+ */
+ CGameObject *getNextMail(CGameObject *prior);
+
+ /**
+ * Finds an object by name within the object's room
*/
- static CGameObject *findUnder(CTreeItem *parent, const CString &name);
+ CGameObject *findRoomObject(const CString &name) const;
/**
* Moves the item from it's original position to be under the current view
@@ -300,6 +300,16 @@ protected:
CRoomItem *getHiddenRoom() const;
/**
+ * Returns a hidden object
+ */
+ CGameObject *getHiddenObject(const CString &name) const;
+
+ /**
+ * Scan the specified room for an item by name
+ */
+ CTreeItem *findUnder(CTreeItem *parent, const CString &name) const;
+
+ /**
* Returns the music room instance from the game manager
*/
CMusicRoom *getMusicRoom() const;
@@ -366,7 +376,7 @@ protected:
public:
bool _isMail;
int _id;
- int _field58;
+ uint _roomFlags;
int _field60;
CursorId _cursorId;
bool _visible;