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/lingo/lingo-the.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines/director/lingo')

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) {
-- 
cgit v1.2.3