[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.290,1.291

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6114/scumm

Modified Files:
	actor.cpp 
Log Message:

Correct auxblock hides.


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -d -r1.290 -r1.291
--- actor.cpp	18 Sep 2004 11:34:55 -0000	1.290
+++ actor.cpp	19 Sep 2004 02:00:33 -0000	1.291
@@ -494,10 +494,8 @@
 			// Causes Zak to lose his body in several scenes, see bug #771508
 			if (_vm->_version >= 3 && f == initFrame)
 				cost.reset();
-			if (_vm->_features & GF_NEW_COSTUMES) {
-				auxBlock.visible = false;
+			if (_vm->_features & GF_NEW_COSTUMES)
 				_vm->akos_decodeData(this, f, (uint) - 1);
-			}
 			else
 				_vm->cost_decodeData(this, f, (uint) - 1);
 			frame = f;
@@ -606,12 +604,8 @@
 			}
 			adjustActorPos();
 		} else {
-			if (_vm->_heversion >= 71) {
-				if (auxBlock.visible) {
-					_vm->queueAuxBlock(this);
-					auxBlock.visible = false;
-				}
-			}
+			if (_vm->_heversion >= 71)
+				_vm->queueAuxBlock(this);
 			hideActor();
 		}
 	} else {
@@ -773,6 +767,7 @@
 	cost.soundCounter = 0;
 	needRedraw = false;
 	needBgReset = true;
+	auxBlock.visible = false;
 }
 
 void Actor::showActor() {
@@ -1366,11 +1361,8 @@
 		memset(animVariable, 0, sizeof(animVariable));
 		costume = c;
 		
-		if (_vm->_heversion >= 71) {
-			if (auxBlock.visible) {
-				_vm->queueAuxBlock(this);
-			}
-		}
+		if (_vm->_heversion >= 71)
+			_vm->queueAuxBlock(this);
 		
 		if (visible) {
 			if (costume) {
@@ -1967,6 +1959,9 @@
 }
 
 void ScummEngine::queueAuxBlock(Actor *a) {
+	if (!a->auxBlock.visible)
+		return;
+
 	assert(_auxBlocksNum < ARRAYSIZE(_auxBlocks));
 	_auxBlocks[_auxBlocksNum] = a->auxBlock;
 	++_auxBlocksNum;