diff options
| author | Paul Gilbert | 2016-06-23 19:08:45 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-07-15 19:24:15 -0400 |
| commit | 54eac84dc5051c9833ea96f0be6c7b44ba262817 (patch) | |
| tree | 566740174dcece7b7c8ebf71db5b0e886e41491d /engines/titanic/core | |
| parent | 3fb8c888a76762160179f331b2df2d3fa967b242 (diff) | |
| download | scummvm-rg350-54eac84dc5051c9833ea96f0be6c7b44ba262817.tar.gz scummvm-rg350-54eac84dc5051c9833ea96f0be6c7b44ba262817.tar.bz2 scummvm-rg350-54eac84dc5051c9833ea96f0be6c7b44ba262817.zip | |
TITANIC: Fix compilation issues
Diffstat (limited to 'engines/titanic/core')
| -rw-r--r-- | engines/titanic/core/game_object.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp index 79ceb92116..f0fd08ae94 100644 --- a/engines/titanic/core/game_object.cpp +++ b/engines/titanic/core/game_object.cpp @@ -790,12 +790,6 @@ void CGameObject::dec54() { getGameManager()->dec54(); } -void CGameObject::petAddRandomRoom(int passClassNum) { - CPetControl *petControl = getPetControl(); - if (petControl) - petControl->addRandomRoom(passClassNum); -} - void CGameObject::lockMouse() { CGameManager *gameMan = getGameManager(); gameMan->lockInputHandler(); @@ -897,7 +891,7 @@ void CGameObject::checkPlayMovie(const CString &name, int flags) { void CGameObject::clearPet() const { CPetControl *petControl = getPetControl(); if (petControl) - petControl->clear(); + petControl->resetActiveNPC(); } CPetControl *CGameObject::getPetControl() const { |