[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.194,1.195

[Travis Howell]

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

Modified Files:
	actor.cpp 
Log Message:

Putt Putt games use old calculation


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -d -r1.194 -r1.195
--- actor.cpp	28 Dec 2003 10:39:39 -0000	1.194
+++ actor.cpp	28 Dec 2003 12:51:18 -0000	1.195
@@ -416,7 +416,7 @@
 }
 
 void Actor::startAnimActor(int f) {
-	if (_vm->_features & GF_NEW_COSTUMES) {
+	if ((_vm->_features & GF_NEW_COSTUMES) && !(_vm->_features & GF_HUMONGOUS)) {
 		switch (f) {
 		case 1001:
 			f = initFrame;
@@ -434,17 +434,6 @@
 			f = talkStopFrame;
 			break;
 		}
-
-		frame = f;
-
-		if (costume != 0) {
-			animProgress = 0;
-			needRedraw = true;
-			if (f == initFrame)
-				cost.reset();
-			_vm->akos_decodeData(this, f, (uint) - 1);
-		}
-
 	} else {
 		switch (f) {
 		case 0x38:
@@ -463,7 +452,19 @@
 			f = talkStopFrame;
 			break;
 		}
-		
+	}
+
+	if (_vm->_features & GF_NEW_COSTUMES) {
+		frame = f;
+
+		if (costume != 0) {
+			animProgress = 0;
+			needRedraw = true;
+			if (f == initFrame)
+				cost.reset();
+			_vm->akos_decodeData(this, f, (uint) - 1);
+		}
+	} else {		
 		assert(f != 0x3E);
 		frame = f;