diff options
author | Paul Gilbert | 2016-06-27 13:43:27 -0400 |
---|---|---|
committer | Paul Gilbert | 2016-07-15 19:25:27 -0400 |
commit | 3988a9eeee98efdd3b297cde76640416fc13f3ca (patch) | |
tree | 95669cf5dec9a191985b6f5f21e8aa4d4e686032 /engines/titanic/pet_control | |
parent | c87a6e212aa190a7473722dfdd34cf794105d265 (diff) | |
download | scummvm-rg350-3988a9eeee98efdd3b297cde76640416fc13f3ca.tar.gz scummvm-rg350-3988a9eeee98efdd3b297cde76640416fc13f3ca.tar.bz2 scummvm-rg350-3988a9eeee98efdd3b297cde76640416fc13f3ca.zip |
TITANIC: Adding more game object methods
Diffstat (limited to 'engines/titanic/pet_control')
-rw-r--r-- | engines/titanic/pet_control/pet_control.cpp | 10 | ||||
-rw-r--r-- | engines/titanic/pet_control/pet_control.h | 11 |
2 files changed, 0 insertions, 21 deletions
diff --git a/engines/titanic/pet_control/pet_control.cpp b/engines/titanic/pet_control/pet_control.cpp index 1643459963..6e30711397 100644 --- a/engines/titanic/pet_control/pet_control.cpp +++ b/engines/titanic/pet_control/pet_control.cpp @@ -513,11 +513,6 @@ void CPetControl::playSound(int soundNum) { } } -CString CPetControl::getRoomName() const { - CRoomItem *room = getRoom(); - return room ? room->getName() : CString(); -} - int CPetControl::canSummonBot(const CString &name) { // If player is the very same view as the NPC, then it's already present if (isBotInView(name)) @@ -652,11 +647,6 @@ CGameObject *CPetControl::findBot(const CString &name, CTreeItem *root) { return nullptr; } -CString CPetControl::getFullViewName() { - CGameManager *gameManager = getGameManager(); - return gameManager ? gameManager->getFullViewName() : CString(); -} - bool CPetControl::isSuccUBusActive() const { if (!_activeNPC) return false; diff --git a/engines/titanic/pet_control/pet_control.h b/engines/titanic/pet_control/pet_control.h index 5601c403f4..75b92d734e 100644 --- a/engines/titanic/pet_control/pet_control.h +++ b/engines/titanic/pet_control/pet_control.h @@ -282,11 +282,6 @@ public: void playSound(int soundNum); /** - * Get the room name - */ - CString getRoomName() const; - - /** * Check whether an NPC can be summoned */ int canSummonBot(const CString &name); @@ -322,12 +317,6 @@ public: void stopPetTimer(uint timerIndex); /** - * Return the full Id of the current view in a - * room.node.view tuplet form - */ - CString getFullViewName(); - - /** * Returns true if all input is currently locked (disabled) */ bool isInputLocked() const { return _inputLockCount > 0; } |