diff options
Diffstat (limited to 'engines/titanic/core')
| -rw-r--r-- | engines/titanic/core/game_object.cpp | 4 | ||||
| -rw-r--r-- | engines/titanic/core/game_object.h | 15 |
2 files changed, 5 insertions, 14 deletions
diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp index a5657f583a..dcc66f569d 100644 --- a/engines/titanic/core/game_object.cpp +++ b/engines/titanic/core/game_object.cpp @@ -1101,10 +1101,6 @@ Point CGameObject::getControid() const { _bounds.top + _bounds.height() / 2); } -void CGameObject::performAction(int actionNum, CViewItem *view) { - // TODO -} - bool CGameObject::clipExistsByStart(const CString &name, int startFrame) const { return _movieClips.existsByStart(name, startFrame); } diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h index 8c53e159be..20059539d9 100644 --- a/engines/titanic/core/game_object.h +++ b/engines/titanic/core/game_object.h @@ -336,11 +336,6 @@ protected: void petClear() const; /** - * Perform an action - */ - void performAction(int actionNum, CViewItem *view = nullptr); - - /** * Returns the MailMan */ CMailMan *getMailMan() const; @@ -361,11 +356,6 @@ 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; @@ -659,6 +649,11 @@ public: Found find(const CString &name, CGameObject **item, int findAreas); /** + * Returns a hidden object + */ + CGameObject *getHiddenObject(const CString &name) const; + + /** * Sets up credits text */ void createCredits(); |