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/pet_control/pet_control.cpp | |
| 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/pet_control/pet_control.cpp')
| -rw-r--r-- | engines/titanic/pet_control/pet_control.cpp | 8 |
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 802e0ada12..22b513ef75 100644 --- a/engines/titanic/pet_control/pet_control.cpp +++ b/engines/titanic/pet_control/pet_control.cpp @@ -59,7 +59,7 @@ void CPetControl::save(SimpleFile *file, int indent) const { file->writeNumberLine(0, indent); file->writeNumberLine(_currentArea, indent); file->writeQuotedLine(_activeNPCName, indent); - file->writeQuotedLine(_string2, indent); + file->writeQuotedLine(_remoteTargetName, indent); saveAreas(file, indent); CGameObject::save(file, indent); @@ -72,7 +72,7 @@ void CPetControl::load(SimpleFile *file) { if (!val) { _currentArea = (PetArea)file->readNumber(); _activeNPCName = file->readString(); - _string2 = file->readString(); + _remoteTargetName = file->readString(); loadAreas(file, 0); } @@ -151,8 +151,8 @@ void CPetControl::postLoad() { if (!_activeNPCName.empty() && root) _activeNPC = root->findByName(_activeNPCName); - if (!_string2.empty() && root) - _remoteTarget = root->findByName(_string2); + if (!_remoteTargetName.empty() && root) + _remoteTarget = static_cast<CGameObject *>(root->findByName(_remoteTargetName)); setArea(_currentArea); loaded(); |