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/motion.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/motion.cpp')
-rw-r--r-- | engines/fullpipe/motion.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp index 05f13d4a8b..47d0591daa 100644 --- a/engines/fullpipe/motion.cpp +++ b/engines/fullpipe/motion.cpp @@ -54,7 +54,7 @@ void MotionController::enableLinks(const char *linkName, bool enable) { MovGraphLink *lnk = (MovGraphLink *)*l; - if (!strcmp(lnk->_name, linkName)) { + if (lnk->_name == linkName) { if (enable) lnk->_flags |= 0x20000000; else @@ -82,7 +82,7 @@ MovGraphLink *MotionController::getLinkByName(const char *name) { MovGraphLink *lnk = (MovGraphLink *)*l; - if (!strcmp(lnk->_name, name)) + if (lnk->_name == name) return lnk; } } @@ -97,7 +97,7 @@ MovGraphLink *MotionController::getLinkByName(const char *name) { MovGraphLink *lnk = (MovGraphLink *)*l; - if (!strcmp(lnk->_name, name)) + if (lnk->_name == name) return lnk; } } @@ -391,7 +391,7 @@ int MctlLadder::findObjectPos(StaticANIObject *obj) { bool MctlLadder::initMovement(StaticANIObject *ani, MctlLadderMovement *movement) { debugC(4, kDebugPathfinding, "MctlLadder::initMovement(*%d, ...)", ani->_id); - GameVar *v = g_fp->getGameLoaderGameVar()->getSubVarByName(ani->getName()); + GameVar *v = g_fp->getGameLoaderGameVar()->getSubVarByName(ani->getName().c_str()); if (!v) return false; @@ -1744,7 +1744,7 @@ bool MctlGraph::fillData(StaticANIObject *obj, MctlAni *item) { item->_obj = obj; item->_objectId = obj->_id; - GameVar *var = g_fp->getGameLoaderGameVar()->getSubVarByName(obj->_objectName); + GameVar *var = g_fp->getGameLoaderGameVar()->getSubVarByName(obj->_objectName.c_str()); if (!var) return false; @@ -2900,7 +2900,6 @@ MovGraphLink::MovGraphLink() { _field_3C = 0; _field_38 = 0; _movGraphReact = 0; - _name = 0; _objtype = kObjTypeMovGraphLink; } |