[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.48,1.49

Max Horn fingolfin at users.sourceforge.net
Sun Jan 5 14:39:03 CET 2003


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

Modified Files:
	actor.cpp 
Log Message:
fix redraw bug in the Dig (when Cmdr Low stands in front of the sparks in the nexus); changed startAnimActor slightly (not fully sure if this is now right or if the previous code was right <sigh>

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- actor.cpp	1 Jan 2003 18:22:40 -0000	1.48
+++ actor.cpp	5 Jan 2003 22:38:44 -0000	1.49
@@ -415,7 +415,6 @@
 
 void Actor::startAnimActor(int f)
 {
-	frame = f;
 	if (_vm->_features & GF_NEW_COSTUMES) {
 		switch (f) {
 		case 1001:
@@ -435,6 +434,8 @@
 			break;
 		}
 
+		frame = f;
+
 		if (costume != 0) {
 			animProgress = 0;
 			needRedraw = true;
@@ -464,6 +465,7 @@
 		}
 		
 		assert(f != 0x3E);
+		frame = f;
 	
 		// FIXME: This is a hack to fix decapitation, which somehow occurs only on
 		// the standFrame (CHORE mode 3). We hack around this by simply using the
@@ -1024,7 +1026,10 @@
 
 		ar.draw_top = top = 0x7fffffff;
 		ar.draw_bottom = bottom = 0;
-		ar.drawCostume();
+		if (ar.drawCostume()) {
+			needBgReset = true;
+			needRedraw = true;
+		}
 		top = ar.draw_top;
 		bottom = ar.draw_bottom;
 	}





More information about the Scummvm-git-logs mailing list