[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.63,1.64 scumm.h,1.151,1.152 scummvm.cpp,2.49,2.50

[Jonathan Gray]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv13458

Modified Files:
	actor.cpp scumm.h scummvm.cpp 
Log Message:
patch #689164 comi verb coin hack by erik, fixes the verb coin drawing behind the inventory

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- actor.cpp	17 Feb 2003 21:40:13 -0000	1.63
+++ actor.cpp	27 Feb 2003 10:17:28 -0000	1.64
@@ -868,6 +868,8 @@
 	// Make a list of all actors in this room
 	for (i = 1; i < NUM_ACTORS; i++) {
 		a = derefActor(i);
+		if ((_features & GF_AFTER_V8) && a->layer < 0)
+			continue;
 		if (a->isInCurrentRoom())
 			actors[numactors++] = a;
 	}
@@ -901,6 +903,23 @@
 	}
 	
 	delete [] actors;
+}
+
+// Used in Scumm v8, to allow the verb coin to be drawn over the inventory
+// chest. I'm assuming that draw order won't matter here.
+void Scumm::processUpperActors()
+{
+	Actor *a;
+	int i;
+
+	for (i = 1; i < NUM_ACTORS; i++) {
+		a = derefActor(i);
+		if (a->isInCurrentRoom() && a->costume && a->layer < 0) {
+			CHECK_HEAP getMaskFromBox(a->walkbox);
+			a->drawActorCostume();
+			CHECK_HEAP a->animateCostume();
+		}
+	}
 }
 
 void Actor::drawActorCostume()

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -d -r1.151 -r1.152
--- scumm.h	18 Feb 2003 01:51:05 -0000	1.151
+++ scumm.h	27 Feb 2003 10:17:29 -0000	1.152
@@ -673,6 +673,7 @@
 	void setActorRedrawFlags(bool fg, bool bg);
 	void resetActorBgs();
 	void processActors();
+	void processUpperActors();
 	int getActorFromPos(int x, int y);
 	void actorFollowCamera(int act);
 	

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.49
retrieving revision 2.50
diff -u -d -r2.49 -r2.50
--- scummvm.cpp	8 Feb 2003 01:27:21 -0000	2.49
+++ scummvm.cpp	27 Feb 2003 10:17:29 -0000	2.50
@@ -562,6 +562,8 @@
 		}
 
 		drawBlastObjects();
+		if (_features & GF_AFTER_V8)
+			processUpperActors();
 		drawBlastTexts();
 		drawDirtyScreenParts();
 		removeBlastObjects();