diff options
author | Filippos Karapetis | 2017-03-22 04:11:49 +0200 |
---|---|---|
committer | Filippos Karapetis | 2017-03-22 04:11:49 +0200 |
commit | f3e81b5f17872186f7c67a551876dd78f268865c (patch) | |
tree | 3465c6ec7a4664cee4b7e893e8e0e0d3c5845603 /engines/fullpipe/interaction.cpp | |
parent | 728b23af2ad939e3da920a41b85730689a1aa71f (diff) | |
download | scummvm-rg350-f3e81b5f17872186f7c67a551876dd78f268865c.tar.gz scummvm-rg350-f3e81b5f17872186f7c67a551876dd78f268865c.tar.bz2 scummvm-rg350-f3e81b5f17872186f7c67a551876dd78f268865c.zip |
FULLPIPE: Use Common::String in all scene object names
Diffstat (limited to 'engines/fullpipe/interaction.cpp')
-rw-r--r-- | engines/fullpipe/interaction.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/engines/fullpipe/interaction.cpp b/engines/fullpipe/interaction.cpp index 84b8fbc3c5..856552a8b1 100644 --- a/engines/fullpipe/interaction.cpp +++ b/engines/fullpipe/interaction.cpp @@ -428,7 +428,6 @@ Interaction::Interaction() { _staticsId2 = 0; _field_28 = 0; _sceneId = -1; - _actionName = 0; } Interaction::~Interaction() { @@ -438,8 +437,6 @@ Interaction::~Interaction() { } delete _messageQueue; - - free(_actionName); } bool Interaction::load(MfcArchive &file) { @@ -496,20 +493,20 @@ bool Interaction::canInteract(GameObject *obj1, GameObject *obj2, int invId) { if (_objectState1) { if (_flags & 0x10) { - if ((g_fp->getObjectState(obj1->getName()) & _objectState1) == 0) + if ((g_fp->getObjectState(obj1->getName().c_str()) & _objectState1) == 0) return false; } else { - if (g_fp->getObjectState(obj1->getName()) != _objectState1) + if (g_fp->getObjectState(obj1->getName().c_str()) != _objectState1) return false; } } if (_objectState2) { if (_flags & 0x10) { - if ((g_fp->getObjectState(obj2->getName()) & _objectState2) == 0) + if ((g_fp->getObjectState(obj2->getName().c_str()) & _objectState2) == 0) return false; } else { - if (g_fp->getObjectState(obj2->getName()) != _objectState2) + if (g_fp->getObjectState(obj2->getName().c_str()) != _objectState2) return false; } } |