diff options
author | Filippos Karapetis | 2017-03-22 04:32:23 +0200 |
---|---|---|
committer | Filippos Karapetis | 2017-03-22 04:32:23 +0200 |
commit | 93982b2ca9b67cd143f603f516570e269f28fa32 (patch) | |
tree | e07900e5f79f9b63135dd91ba228252bc409176f /engines/fullpipe/statics.cpp | |
parent | 56ec429537ee86a5e8cda0f027a21f217f1c16a2 (diff) | |
download | scummvm-rg350-93982b2ca9b67cd143f603f516570e269f28fa32.tar.gz scummvm-rg350-93982b2ca9b67cd143f603f516570e269f28fa32.tar.bz2 scummvm-rg350-93982b2ca9b67cd143f603f516570e269f28fa32.zip |
FULLPIPE: Change more object-related functions to use Common::String
Diffstat (limited to 'engines/fullpipe/statics.cpp')
-rw-r--r-- | engines/fullpipe/statics.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp index 5c83114e10..5032ca719f 100644 --- a/engines/fullpipe/statics.cpp +++ b/engines/fullpipe/statics.cpp @@ -418,7 +418,7 @@ Statics *StaticANIObject::getStaticsById(int itemId) { return 0; } -Statics *StaticANIObject::getStaticsByName(char *name) { +Statics *StaticANIObject::getStaticsByName(Common::String &name) { for (uint i = 0; i < _staticsList.size(); i++) if (_staticsList[i]->_staticsName == name) return _staticsList[i]; @@ -450,7 +450,7 @@ int StaticANIObject::getMovementIdById(int itemId) { return 0; } -Movement *StaticANIObject::getMovementByName(char *name) { +Movement *StaticANIObject::getMovementByName(Common::String &name) { for (uint i = 0; i < _movements.size(); i++) if (_movements[i]->_objectName == name) return _movements[i]; @@ -681,7 +681,7 @@ void StaticANIObject::draw2() { } MovTable *StaticANIObject::countMovements() { - GameVar *preloadSubVar = g_fp->getGameLoaderGameVar()->getSubVarByName(getName().c_str())->getSubVarByName("PRELOAD"); + GameVar *preloadSubVar = g_fp->getGameLoaderGameVar()->getSubVarByName(getName())->getSubVarByName("PRELOAD"); if (!preloadSubVar || preloadSubVar->getSubVarsCount() == 0) return 0; @@ -706,7 +706,7 @@ MovTable *StaticANIObject::countMovements() { } void StaticANIObject::setSpeed(int speed) { - GameVar *var = g_fp->getGameLoaderGameVar()->getSubVarByName(getName().c_str())->getSubVarByName("SpeedUp"); + GameVar *var = g_fp->getGameLoaderGameVar()->getSubVarByName(getName())->getSubVarByName("SpeedUp"); if (!var) return; |