Patch 668634: Actor iteration fix

svn-id: r6484

1 files changed, 6 insertions, 6 deletions

diff --git a/scumm/actor.cpp b/scumm/actor.cpp
index 478156bb8f..5c37f12285 100644
--- a/scumm/actor.cpp
+++ b/scumm/actor.cpp
@@ -1103,7 +1103,7 @@ void Scumm::setActorRedrawFlags(bool fg, bool bg)
 	int i, j;
 
 	if (_fullRedraw) {
-		for (j = 0; j < NUM_ACTORS; j++) {
+		for (j = 1; j < NUM_ACTORS; j++) {
 			Actor *a = derefActor(j);
 			if (fg)
 				a->needRedraw = true;
@@ -1114,7 +1114,7 @@ void Scumm::setActorRedrawFlags(bool fg, bool bg)
 		for (i = 0; i < gdi._numStrips; i++) {
 			int strip = _screenStartStrip + i;
 			if (testGfxAnyUsageBits(strip)) {
-				for (j = 0; j < NUM_ACTORS; j++) {
+				for (j = 1; j < NUM_ACTORS; j++) {
 					if (testGfxUsageBit(strip, j) && testGfxOtherUsageBits(strip, j)) {
 						Actor *a = derefActor(j);
 						if (fg)
@@ -1543,18 +1543,18 @@ void Scumm::resetActorBgs()
 
 	for (i = 0; i < gdi._numStrips; i++) {
 		int strip = _screenStartStrip + i;
-		a = getFirstActor();
-		for (j = 0; j < NUM_ACTORS; j++) {
+		for (j = 1; j < NUM_ACTORS; j++) {
+			a = derefActor(j);
 			if (testGfxUsageBit(strip, j) && a->top != 0xFF && a->needBgReset) {
 				clearGfxUsageBit(strip, j);
 				if ((a->bottom - a->top) >= 0)
 					gdi.resetBackground(a->top, a->bottom, i);
 			}
-			a++;
 		}
 	}
 
-	for (i = 1, a = getFirstActor(); ++a, i < NUM_ACTORS; i++) {
+	for (i = 1; i < NUM_ACTORS; i++) {
+		a = derefActor(j);
 		a->needBgReset = false;
 	}
 }