diff options
| author | Eugene Sandulenko | 2019-12-30 13:43:23 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2019-12-30 13:43:23 +0100 |
| commit | d5b963a3b997067c874e6fb21445266bc4a1e766 (patch) | |
| tree | 9f4e553e5dc26df98215619d2a50fa2aa1f6dd63 /engines/director/lingo | |
| parent | 6810957e6db2e9f72170edbebfb11830fe519019 (diff) | |
| download | scummvm-rg350-d5b963a3b997067c874e6fb21445266bc4a1e766.tar.gz scummvm-rg350-d5b963a3b997067c874e6fb21445266bc4a1e766.tar.bz2 scummvm-rg350-d5b963a3b997067c874e6fb21445266bc4a1e766.zip | |
DIRECTOR: Get rid of _castTypes[]
Diffstat (limited to 'engines/director/lingo')
| -rw-r--r-- | engines/director/lingo/lingo-the.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp index 09a9fc8a55..a1fa3e11e2 100644 --- a/engines/director/lingo/lingo-the.cpp +++ b/engines/director/lingo/lingo-the.cpp @@ -340,7 +340,7 @@ void Lingo::setTheSprite(Datum &id1, int field, Datum &d) { switch (field) { case kTheCastNum: - if (_vm->getCurrentScore()->_castTypes.contains(d.u.i)) { + if (_vm->getCurrentScore()->_loadedCast->contains(d.u.i)) { _vm->getCurrentScore()->loadCastInto(sprite, d.u.i); sprite->_castId = d.u.i; } @@ -658,7 +658,7 @@ Datum Lingo::getTheCast(Datum &id1, int field) { CastType castType; CastInfo *castInfo; - if (!_vm->getCurrentScore()->_castTypes.contains(id)) { + if (!_vm->getCurrentScore()->_loadedCast->contains(id)) { if (field == kTheLoaded) { d.type = INT; d.u.i = 0; @@ -669,7 +669,7 @@ Datum Lingo::getTheCast(Datum &id1, int field) { warning("Lingo::getTheCast(): The cast %d found", id); } - castType = _vm->getCurrentScore()->_castTypes[id]; + castType = _vm->getCurrentScore()->_loadedCast->getVal(id)->_type; castInfo = _vm->getCurrentScore()->_castsInfo[id]; d.type = INT; @@ -748,7 +748,7 @@ void Lingo::setTheCast(Datum &id1, int field, Datum &d) { return; } - CastType castType = score->_castTypes[id]; + CastType castType = score->_loadedCast->getVal(id)->_type; CastInfo *castInfo = score->_castsInfo[id + score->_castIDoffset]; switch (field) { |