[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.62,1.63

[Jonathan Gray]

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

Modified Files:
	actor.cpp 
Log Message:
not sure if all of these AFTER_V7 for NEW_COSTUMES changes are needed but it won't hurt in any event

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- actor.cpp	26 Jan 2003 10:54:33 -0000	1.62
+++ actor.cpp	17 Feb 2003 21:40:13 -0000	1.63
@@ -259,11 +259,11 @@
 	int num;
 	bool shouldInterpolate;
 
-	dirType = (_vm->_features & GF_AFTER_V7) ? _vm->akos_hasManyDirections(this) : false;
+	dirType = (_vm->_features & GF_NEW_COSTUMES) ? _vm->akos_hasManyDirections(this) : false;
 
 	from = toSimpleDir(dirType, facing);
 	dir = remapDirection(newDirection, is_walking);
-	if (_vm->_features & GF_AFTER_V7)
+	if (_vm->_features & GF_NEW_COSTUMES)
 		// Direction interpolation interfers with walk scripts in Dig; they perform
 		// (much better) interpolation themselves.
 		shouldInterpolate = false;	
@@ -486,7 +486,7 @@
 {
 	int cmd, dir;
 
-	if (_vm->_features & GF_AFTER_V7) {
+	if (_vm->_features & GF_NEW_COSTUMES) {
 
 		if (anim == 0xFF)
 			anim = 2000;
@@ -540,7 +540,7 @@
 		vald = cost.frame[i];
 		if (vald == 0xFFFF)
 			continue;
-		if (_vm->_features & GF_AFTER_V7)
+		if (_vm->_features & GF_NEW_COSTUMES)
 			_vm->akos_decodeData(this, vald, aMask);
 		else
 			_vm->cost_decodeData(this, vald, aMask);
@@ -709,7 +709,7 @@
 	moving = 0;
 	cost.animCounter2 = 0;
 
-	if (_vm->_features & GF_AFTER_V7) {
+	if (_vm->_features & GF_NEW_COSTUMES) {
 		stopActorMoving();
 	}
 
@@ -803,7 +803,7 @@
 	act = _vars[VAR_TALK_ACTOR];
 	if (act && act < 0x80) {
 		Actor *a = derefActorSafe(act, "stopTalk");
-		if ((a->isInCurrentRoom() && _useTalkAnims) || (_features & GF_AFTER_V7)) {
+		if ((a->isInCurrentRoom() && _useTalkAnims) || (_features & GF_NEW_COSTUMES)) {
 			a->startAnimActor(a->talkFrame2);
 			_useTalkAnims = false;
 		}
@@ -912,7 +912,7 @@
 
 	setupActorScale();
 
-	if (!(_vm->_features & GF_AFTER_V7)) {
+	if (!(_vm->_features & GF_NEW_COSTUMES)) {
 		CostumeRenderer cr(_vm);
 
 		cr._actorX = x - _vm->virtscr[0].xstart;
@@ -1044,7 +1044,7 @@
 	if (animProgress >= animSpeed) {
 		animProgress = 0;
 
-		if (_vm->_features & GF_AFTER_V7) {
+		if (_vm->_features & GF_NEW_COSTUMES) {
 			byte *akos = _vm->getResourceAddress(rtCostume, costume);
 			assert(akos);
 			if (_vm->akos_increaseAnims(akos, this)) {
@@ -1162,7 +1162,7 @@
 		oldact = 0;
 	} else {
 		a = derefActorSafe(_actorToPrintStrFor, "actorTalk");
-		if (!a->isInCurrentRoom() && !(_features & GF_AFTER_V7)) {
+		if (!a->isInCurrentRoom() && !(_features & GF_NEW_COSTUMES)) {
 			oldact = 0xFF;
 		} else {
 			if (!_keepText)
@@ -1207,7 +1207,7 @@
 		cost.reset();
 	}
 
-	if (_vm->_features & GF_AFTER_V7) {
+	if (_vm->_features & GF_NEW_COSTUMES) {
 		for (i = 0; i < 256; i++)
 			palette[i] = 0xFF;
 	} else {