[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.143.2.1,1.143.2.2

[Max Horn]

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

Modified Files:
      Tag: branch-0-5-0
	actor.cpp 
Log Message:
setActorCostume fix for COMI seems to be succesful so far, with no reported regressions and fixing several bugs -> putting it into 0.5.x branch

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.143.2.1
retrieving revision 1.143.2.2
diff -u -d -r1.143.2.1 -r1.143.2.2
--- actor.cpp	27 Jul 2003 23:45:43 -0000	1.143.2.1
+++ actor.cpp	5 Aug 2003 12:51:44 -0000	1.143.2.2
@@ -1195,17 +1195,31 @@
 	int i;
 
 	costumeNeedsInit = true;
-
-	if (visible) {
-		hideActor();
+	
+	if (_vm->_version == 8) {
 		cost.reset();
+		memset(animVariable, 0, sizeof(animVariable));
 		costume = c;
-		showActor();
+		
+		if (visible) {
+			if (costume) {
+				_vm->ensureResourceLoaded(rtCostume, costume);
+			}
+			startAnimActor(initFrame);
+		}
 	} else {
-		costume = c;
-		cost.reset();
+		if (visible) {
+			hideActor();
+			cost.reset();
+			costume = c;
+			showActor();
+		} else {
+			costume = c;
+			cost.reset();
+		}
 	}
 
+
 	if (_vm->_features & GF_NEW_COSTUMES) {
 		for (i = 0; i < 256; i++)
 			palette[i] = 0xFF;
@@ -1216,7 +1230,6 @@
 		for (i = 0; i < 32; i++)
 			palette[i] = 0xFF;
 	}
-
 }
 
 void Actor::startWalkActor(int destX, int destY, int dir) {