aboutsummaryrefslogtreecommitdiff
path: root/engines/fullpipe/behavior.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/fullpipe/behavior.cpp')
-rw-r--r--engines/fullpipe/behavior.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/fullpipe/behavior.cpp b/engines/fullpipe/behavior.cpp
index 80542afcb6..694f7d0799 100644
--- a/engines/fullpipe/behavior.cpp
+++ b/engines/fullpipe/behavior.cpp
@@ -64,13 +64,13 @@ void BehaviorManager::initBehavior(Scene *sc, GameVar *var) {
for (GameVar *subvar = behvar->_subVars; subvar; subvar = subvar->_nextVarObj) {
debugC(3, kDebugBehavior, "BehaviorManager::initBehavior. subVar %s", transCyrillic(subvar->_varName));
- if (!strcmp(subvar->_varName, "AMBIENT")) {
+ if (subvar->_varName == "AMBIENT") {
behinfo = new BehaviorInfo;
behinfo->initAmbientBehavior(subvar, sc);
_behaviors.push_back(behinfo);
} else {
- StaticANIObject *ani = sc->getStaticANIObject1ByName(subvar->_varName, -1);
+ StaticANIObject *ani = sc->getStaticANIObject1ByName((char *)subvar->_varName.c_str(), -1);
if (ani) {
for (uint i = 0; i < sc->_staticANIObjectList1.size(); i++) {
if (((StaticANIObject *)sc->_staticANIObjectList1[i])->_id == ani->_id) {
@@ -279,7 +279,7 @@ void BehaviorInfo::initObjectBehavior(GameVar *var, Scene *sc, StaticANIObject *
if (strcmp(var->_value.stringValue, "ROOT"))
break;
- GameVar *v1 = g_fp->getGameLoaderGameVar()->getSubVarByName("BEHAVIOR")->getSubVarByName(ani->getName());
+ GameVar *v1 = g_fp->getGameLoaderGameVar()->getSubVarByName("BEHAVIOR")->getSubVarByName(ani->getName().c_str());
if (v1 == var)
return;
@@ -317,7 +317,7 @@ BehaviorAnim::BehaviorAnim(GameVar *var, Scene *sc, StaticANIObject *ani, int *m
_flags = 0;
_behaviorMoves = 0;
- Statics *st = ani->getStaticsByName(var->_varName);
+ Statics *st = ani->getStaticsByName((char *)var->_varName.c_str());
if (st)
_staticsId = st->_staticsId;
@@ -346,7 +346,7 @@ BehaviorMove::BehaviorMove(GameVar *subvar, Scene *sc, int *delay) {
_delay = 0;
_percent = 0;
_flags = 0;
- _messageQueue = sc->getMessageQueueByName(subvar->_varName);
+ _messageQueue = sc->getMessageQueueByName((char *)subvar->_varName.c_str());
GameVar *vart = subvar->getSubVarByName("dwDelay");
if (vart)