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/frame.cpp | |
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/frame.cpp')
-rw-r--r-- | engines/director/frame.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp index 0770f7656c..45c5f87780 100644 --- a/engines/director/frame.cpp +++ b/engines/director/frame.cpp @@ -604,16 +604,16 @@ void Frame::renderSprites(Graphics::ManagedSurface &surface, bool renderTrail) { break; } } else { - if (!_vm->getCurrentScore()->_castTypes.contains(_sprites[i]->_castId)) { - if (!_vm->getSharedCastTypes()->contains(_sprites[i]->_castId)) { + if (!_vm->getCurrentScore()->_loadedCast->contains(_sprites[i]->_castId)) { + if (!_vm->getSharedScore()->_loadedCast->contains(_sprites[i]->_castId)) { debugC(1, kDebugImages, "Frame::renderSprites(): Cast id %d not found", _sprites[i]->_castId); continue; } else { debugC(1, kDebugImages, "Frame::renderSprites(): Getting cast id %d from shared cast", _sprites[i]->_castId); - castType = _vm->getSharedCastTypes()->getVal(_sprites[i]->_castId); + castType = _vm->getSharedScore()->_loadedCast->getVal(_sprites[i]->_castId)->_type; } } else { - castType = _vm->getCurrentScore()->_castTypes[_sprites[i]->_castId]; + castType = _vm->getCurrentScore()->_loadedCast->getVal(_sprites[i]->_castId)->_type; } } |