aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/pet_control/pet_control.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2016-04-29 07:54:54 -0400
committerPaul Gilbert2016-07-10 16:22:40 -0400
commitb117bae55a52efdfd0e7593e4e3038d22101d8bc (patch)
tree7d57ee8c7c95bfb2f854fb106cf843f9bd2413e9 /engines/titanic/pet_control/pet_control.cpp
parent487f2cef0f0be9bae3b815623b4dceb02e466ce0 (diff)
downloadscummvm-rg350-b117bae55a52efdfd0e7593e4e3038d22101d8bc.tar.gz
scummvm-rg350-b117bae55a52efdfd0e7593e4e3038d22101d8bc.tar.bz2
scummvm-rg350-b117bae55a52efdfd0e7593e4e3038d22101d8bc.zip
TITANIC: Implemented conversations text input entry
Diffstat (limited to 'engines/titanic/pet_control/pet_control.cpp')
-rw-r--r--engines/titanic/pet_control/pet_control.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/titanic/pet_control/pet_control.cpp b/engines/titanic/pet_control/pet_control.cpp
index 89ea9e956a..997d35b681 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),
- _treeItem1(nullptr), _treeItem2(nullptr), _hiddenRoom(nullptr),
+ _activeNPC(nullptr), _treeItem2(nullptr), _hiddenRoom(nullptr),
_drawBounds(20, 350, 620, 480) {
setup();
_timers[0] = _timers[1] = nullptr;
@@ -60,7 +60,7 @@ CPetControl::CPetControl() : CGameObject(),
void CPetControl::save(SimpleFile *file, int indent) const {
file->writeNumberLine(0, indent);
file->writeNumberLine(_currentArea, indent);
- file->writeQuotedLine(_string1, indent);
+ file->writeQuotedLine(_activeNPCName, indent);
file->writeQuotedLine(_string2, indent);
saveAreas(file, indent);
@@ -73,7 +73,7 @@ void CPetControl::load(SimpleFile *file) {
if (!val) {
_currentArea = (PetArea)file->readNumber();
- _string1 = file->readString();
+ _activeNPCName = file->readString();
_string2 = file->readString();
loadAreas(file, 0);
@@ -151,8 +151,8 @@ Rect CPetControl::getBounds() {
void CPetControl::postLoad() {
CProjectItem *root = getRoot();
- if (!_string1.empty() && root)
- _treeItem1 = root->findByName(_string1);
+ if (!_activeNPCName.empty() && root)
+ _activeNPC = root->findByName(_activeNPCName);
if (!_string2.empty() && root)
_treeItem2 = root->findByName(_string2);