diff options
author | Paul Gilbert | 2016-06-23 07:39:25 -0400 |
---|---|---|
committer | Paul Gilbert | 2016-07-15 19:24:11 -0400 |
commit | 3fb8c888a76762160179f331b2df2d3fa967b242 (patch) | |
tree | 4241fbf665a4618164ee9988718a49d644b24456 /engines/titanic/pet_control | |
parent | 5a328ce28f4edfe3da0c261d7abc884aa6af94a2 (diff) | |
download | scummvm-rg350-3fb8c888a76762160179f331b2df2d3fa967b242.tar.gz scummvm-rg350-3fb8c888a76762160179f331b2df2d3fa967b242.tar.bz2 scummvm-rg350-3fb8c888a76762160179f331b2df2d3fa967b242.zip |
TITANIC: Adding miscellaneous CGameObject & CPetControl methods
Diffstat (limited to 'engines/titanic/pet_control')
-rw-r--r-- | engines/titanic/pet_control/pet_control.cpp | 15 | ||||
-rw-r--r-- | engines/titanic/pet_control/pet_control.h | 18 |
2 files changed, 23 insertions, 10 deletions
diff --git a/engines/titanic/pet_control/pet_control.cpp b/engines/titanic/pet_control/pet_control.cpp index 45b5ac3c93..802e0ada12 100644 --- a/engines/titanic/pet_control/pet_control.cpp +++ b/engines/titanic/pet_control/pet_control.cpp @@ -178,9 +178,14 @@ void CPetControl::enterRoom(CRoomItem *room) { _remote.enterRoom(room); } -void CPetControl::clear() { +void CPetControl::resetRemoteTarget() { _remoteTarget = nullptr; - _string2.clear(); + _remoteTargetName.clear(); +} + +void CPetControl::resetActiveNPC() { + _activeNPC = nullptr; + _activeNPCName = ""; } bool CPetControl::fn1(int val) { @@ -219,12 +224,12 @@ void CPetControl::highlightGlyph(int id) { _sections[_currentArea]->highlight(id); } -void CPetControl::fn3(CTreeItem *item) { +void CPetControl::setRemoteTarget(CGameObject *item) { _remoteTarget = item; if (item) - _string2 = item->getName(); + _remoteTargetName = item->getName(); else - _string2.clear(); + _remoteTargetName.clear(); } CRoomItem *CPetControl::getHiddenRoom() { diff --git a/engines/titanic/pet_control/pet_control.h b/engines/titanic/pet_control/pet_control.h index c9056a7b32..3881bda78f 100644 --- a/engines/titanic/pet_control/pet_control.h +++ b/engines/titanic/pet_control/pet_control.h @@ -63,7 +63,7 @@ private: CPetMessage _message; CPetFrame _frame; CString _activeNPCName; - CString _string2; + CString _remoteTargetName; CRoomItem *_hiddenRoom; Rect _drawBounds; PetEventInfo _timers[2]; @@ -112,7 +112,7 @@ protected: public: PetArea _currentArea; CTreeItem *_activeNPC; - CTreeItem *_remoteTarget; + CGameObject *_remoteTarget; public: CLASSDEF CPetControl(); @@ -158,13 +158,21 @@ public: void enterRoom(CRoomItem *room); /** - * Called to clear the PET display + * Called to reset the remote target */ - void clear(); + void resetRemoteTarget(); + + /** + * Resets the Active NPC + */ + void resetActiveNPC(); bool fn1(int val); - void fn3(CTreeItem *item); + /** + * Set the remote target + */ + void setRemoteTarget(CGameObject *item); /** * Sets the currently viewed area within the PET |