aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/pet_control/pet_control.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2016-05-01 22:33:54 -0400
committerPaul Gilbert2016-07-10 16:38:05 -0400
commitc3dadcfe3b9d62eb19970b200e941f138f8abf1b (patch)
tree86cb10425d020ff41e0d469381cdebdebbf6c0f3 /engines/titanic/pet_control/pet_control.cpp
parent8a6a5ad5c10b682bef145b414ebed386aa7df842 (diff)
downloadscummvm-rg350-c3dadcfe3b9d62eb19970b200e941f138f8abf1b.tar.gz
scummvm-rg350-c3dadcfe3b9d62eb19970b200e941f138f8abf1b.tar.bz2
scummvm-rg350-c3dadcfe3b9d62eb19970b200e941f138f8abf1b.zip
TITANIC: Beginnings of PET Remote glyph classes
Diffstat (limited to 'engines/titanic/pet_control/pet_control.cpp')
-rw-r--r--engines/titanic/pet_control/pet_control.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/titanic/pet_control/pet_control.cpp b/engines/titanic/pet_control/pet_control.cpp
index 2bd8864998..c115cb5979 100644
--- a/engines/titanic/pet_control/pet_control.cpp
+++ b/engines/titanic/pet_control/pet_control.cpp
@@ -44,7 +44,7 @@ END_MESSAGE_MAP()
CPetControl::CPetControl() : CGameObject(),
_currentArea(PET_CONVERSATION), _fieldC0(0), _locked(0), _fieldC8(0),
- _activeNPC(nullptr), _treeItem2(nullptr), _hiddenRoom(nullptr),
+ _activeNPC(nullptr), _remoteTarget(nullptr), _hiddenRoom(nullptr),
_drawBounds(20, 350, 620, 480) {
_sections[PET_INVENTORY] = &_inventory;
_sections[PET_CONVERSATION] = &_conversations;
@@ -152,7 +152,7 @@ void CPetControl::postLoad() {
if (!_activeNPCName.empty() && root)
_activeNPC = root->findByName(_activeNPCName);
if (!_string2.empty() && root)
- _treeItem2 = root->findByName(_string2);
+ _remoteTarget = root->findByName(_string2);
setArea(_currentArea);
loaded();
@@ -179,7 +179,7 @@ void CPetControl::enterRoom(CRoomItem *room) {
}
void CPetControl::clear() {
- _treeItem2 = nullptr;
+ _remoteTarget = nullptr;
_string2.clear();
}
@@ -216,7 +216,7 @@ void CPetControl::fn2(int val) {
}
void CPetControl::fn3(CTreeItem *item) {
- _treeItem2 = item;
+ _remoteTarget = item;
if (item)
_string2 = item->getName();
else