From d5b963a3b997067c874e6fb21445266bc4a1e766 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Mon, 30 Dec 2019 13:43:23 +0100 Subject: DIRECTOR: Get rid of _castTypes[] --- engines/director/frame.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'engines/director/frame.cpp') 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; } } -- cgit v1.2.3