From 1537e162f607610947f1ab0ccdeae31a00caaf36 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Thu, 25 Sep 2008 10:11:06 +0000
Subject: SCUMM: Moved more stuf from class Actor to ActorHE

svn-id: r34648
---
 engines/scumm/he/intern_he.h      |  3 ++-
 engines/scumm/he/script_v71he.cpp |  8 ++++----
 engines/scumm/he/script_v90he.cpp | 10 +++++-----
 3 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'engines/scumm/he')

diff --git a/engines/scumm/he/intern_he.h b/engines/scumm/he/intern_he.h
index 72ba7edb85..8fd9122503 100644
--- a/engines/scumm/he/intern_he.h
+++ b/engines/scumm/he/intern_he.h
@@ -39,6 +39,7 @@ class WriteStream;
 
 namespace Scumm {
 
+class ActorHE;
 class ResExtractor;
 #ifdef ENABLE_HE
 class LogicHE;
@@ -243,7 +244,7 @@ public:
 	AuxEntry _auxEntries[16];
 	uint16 _auxEntriesNum;
 
-	void queueAuxBlock(Actor *a);
+	void queueAuxBlock(ActorHE *a);
 	void queueAuxEntry(int actorNum, int subIndex);
 
 	void remapHEPalette(const uint8 *src, uint8 *dst);
diff --git a/engines/scumm/he/script_v71he.cpp b/engines/scumm/he/script_v71he.cpp
index 557fd2d285..f11825dbee 100644
--- a/engines/scumm/he/script_v71he.cpp
+++ b/engines/scumm/he/script_v71he.cpp
@@ -498,7 +498,7 @@ void ScummEngine_v71he::adjustRect(Common::Rect &rect) {
 void ScummEngine_v71he::o71_kernelSetFunctions() {
 	int args[29];
 	int num;
-	Actor *a;
+	ActorHE *a;
 
 	num = getStackList(args, ARRAYSIZE(args));
 
@@ -509,7 +509,7 @@ void ScummEngine_v71he::o71_kernelSetFunctions() {
 		virtScreenLoad(args[1], args[2], args[3], args[4], args[5]);
 		break;
 	case 20: // HE72+
-		a = derefActor(args[1], "o71_kernelSetFunctions: 20");
+		a = (ActorHE *)derefActor(args[1], "o71_kernelSetFunctions: 20");
 		((ScummEngine_v71he *)this)->queueAuxBlock(a);
 		break;
 	case 21:
@@ -531,14 +531,14 @@ void ScummEngine_v71he::o71_kernelSetFunctions() {
 		redrawAllActors();
 		break;
 	case 26:
-		a = derefActor(args[1], "o71_kernelSetFunctions: 26");
+		a = (ActorHE *)derefActor(args[1], "o71_kernelSetFunctions: 26");
 		a->_auxBlock.r.left = 0;
 		a->_auxBlock.r.right = -1;
 		a->_auxBlock.r.top = 0;
 		a->_auxBlock.r.bottom = -2;
 		break;
 	case 30:
-		a = derefActor(args[1], "o71_kernelSetFunctions: 30");
+		a = (ActorHE *)derefActor(args[1], "o71_kernelSetFunctions: 30");
 		a->_clipOverride.bottom = args[2];
 		break;
 	case 42:
diff --git a/engines/scumm/he/script_v90he.cpp b/engines/scumm/he/script_v90he.cpp
index 607628ea4b..9829d0ecb5 100644
--- a/engines/scumm/he/script_v90he.cpp
+++ b/engines/scumm/he/script_v90he.cpp
@@ -1615,13 +1615,13 @@ void ScummEngine_v90he::o90_getWizData() {
 }
 
 void ScummEngine_v90he::o90_getActorData() {
-	Actor *a;
+	ActorHE *a;
 
 	int subOp = pop();
 	int val = pop();
 	int act = pop();
 
-	a = derefActor(act, "o90_getActorData");
+	a = (ActorHE *)derefActor(act, "o90_getActorData");
 
 	switch (subOp) {
 	case 1:
@@ -2568,13 +2568,13 @@ void ScummEngine_v90he::o90_kernelGetFunctions() {
 void ScummEngine_v90he::o90_kernelSetFunctions() {
 	int args[29];
 	int num, tmp;
-	Actor *a;
+	ActorHE *a;
 
 	num = getStackList(args, ARRAYSIZE(args));
 
 	switch (args[0]) {
 	case 20:
-		a = derefActor(args[1], "o90_kernelSetFunctions: 20");
+		a = (ActorHE *)derefActor(args[1], "o90_kernelSetFunctions: 20");
 		queueAuxBlock(a);
 		break;
 	case 21:
@@ -2616,7 +2616,7 @@ void ScummEngine_v90he::o90_kernelSetFunctions() {
 		// Remote start script function
 		break;
 	case 1969:
-		a = derefActor(args[1], "o90_kernelSetFunctions: 1969");
+		a = (ActorHE *)derefActor(args[1], "o90_kernelSetFunctions: 1969");
 		tmp = a->_heCondMask;
 		tmp ^= args[2];
 		tmp &= 0x7FFF0000;
-- 
cgit v1.2.3