diff options
author | Nicola Mettifogo | 2008-01-08 20:32:29 +0000 |
---|---|---|
committer | Nicola Mettifogo | 2008-01-08 20:32:29 +0000 |
commit | 1b80eedaa18c38ffa2203eb661fda44d245ca6da (patch) | |
tree | 999c51eac74608de97f90bcb218442c4debc7741 /engines/parallaction/parallaction.cpp | |
parent | cd23db6ce8fb660320804e1355f37558c2ebccc4 (diff) | |
download | scummvm-rg350-1b80eedaa18c38ffa2203eb661fda44d245ca6da.tar.gz scummvm-rg350-1b80eedaa18c38ffa2203eb661fda44d245ca6da.tar.bz2 scummvm-rg350-1b80eedaa18c38ffa2203eb661fda44d245ca6da.zip |
Added a proper _name member to Zone, instead of using the label text.
svn-id: r30343
Diffstat (limited to 'engines/parallaction/parallaction.cpp')
-rw-r--r-- | engines/parallaction/parallaction.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp index 59d81f1f93..9327982a71 100644 --- a/engines/parallaction/parallaction.cpp +++ b/engines/parallaction/parallaction.cpp @@ -729,7 +729,7 @@ void Parallaction::parseStatement() { Animation *Parallaction::findAnimation(const char *name) { for (AnimationList::iterator it = _animations.begin(); it != _animations.end(); it++) - if (!scumm_stricmp((*it)->_label._text, name)) return *it; + if (!scumm_stricmp((*it)->_name, name)) return *it; return NULL; } @@ -900,7 +900,7 @@ void Parallaction::doLocationEnterTransition() { Zone *Parallaction::findZone(const char *name) { for (ZoneList::iterator it = _zones.begin(); it != _zones.end(); it++) { - if (!scumm_stricmp((*it)->_label._text, name)) return *it; + if (!scumm_stricmp((*it)->_name, name)) return *it; } return findAnimation(name); @@ -918,7 +918,7 @@ void Parallaction::freeZones() { // to retain special - needed - zones that were lost across location switches. Zone* z = *it; if (((z->_top == -1) || (z->_left == -2)) && ((_engineFlags & kEngineQuit) == 0)) { - debugC(2, kDebugExec, "freeZones preserving zone '%s'", z->_label._text); + debugC(2, kDebugExec, "freeZones preserving zone '%s'", z->_name); it++; } else { it = _zones.erase(it); @@ -950,7 +950,7 @@ Character::Character(Parallaction *vm) : _vm(vm), _builder(&_ani) { _ani._flags = kFlagsActive | kFlagsNoName; _ani._type = kZoneYou; _ani._label._cnv.pixels = NULL; - _ani._label._text = strdup("yourself"); + strncpy(_ani._name, "yourself", ZONENAME_LENGTH); } void Character::getFoot(Common::Point &foot) { |