[Scummvm-cvs-logs] CVS: scummvm/saga animation.cpp,1.63,1.64 animation.h,1.35,1.36 ihnm_introproc.cpp,1.54,1.55 ite_introproc.cpp,1.68,1.69

[Andrew Kurushin]

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

Modified Files:
	animation.cpp animation.h ihnm_introproc.cpp ite_introproc.cpp 
Log Message:
fix #1298659 [WyrmKeep logo overdraw]

Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/animation.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- animation.cpp	28 Sep 2005 06:33:13 -0000	1.63
+++ animation.cpp	1 Oct 2005 11:09:49 -0000	1.64
@@ -241,7 +241,7 @@
 	anim->cycles = anim->maxFrame;
 
 	anim->frameTime = DEFAULT_FRAME_TIME;
-	anim->flags = 0;
+	anim->flags = ANIM_FLAG_NONE;
 	anim->linkId = -1;
 	anim->state = ANIM_PAUSE;
 }
@@ -314,7 +314,7 @@
 		if (anim->currentFrame > anim->maxFrame) {
 			anim->currentFrame = anim->loopFrame;
 
-			if (anim->flags & ANIM_STOPPING || anim->currentFrame == -1) {
+			if (anim->state == ANIM_STOPPING || anim->currentFrame == -1) {
 				anim->state = ANIM_PAUSE;
 			}
 		}
@@ -322,7 +322,7 @@
 		// Animation done playing
 		anim->state = ANIM_PAUSE;
 		if (anim->linkId == -1) {
-			if (anim->flags & ANIM_ENDSCENE) {
+			if (anim->flags & ANIM_FLAG_ENDSCENE) {
 				// This animation ends the scene
 				event.type = kEvTOneshot;
 				event.code = kSceneEvent;
@@ -339,9 +339,9 @@
 		linkAnim = getAnimation(anim->linkId);
 
 		debug(5, "Animation ended going to %d", anim->linkId);
-		linkAnim->cycles = anim->cycles;
-		linkAnim->currentFrame = 0;
-		linkAnim->completed = 0;
+//		linkAnim->cycles = anim->cycles;
+//		linkAnim->currentFrame = 0;
+//		linkAnim->completed = 0;
 		linkAnim->state = ANIM_PLAYING;
 		animId = anim->linkId;
 		frameTime = 0;

Index: animation.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/animation.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- animation.h	30 Sep 2005 09:14:21 -0000	1.35
+++ animation.h	1 Oct 2005 11:09:49 -0000	1.36
@@ -47,8 +47,12 @@
 enum AnimationState {
 	ANIM_PLAYING = 0x01,
 	ANIM_PAUSE = 0x02,
-	ANIM_STOPPING = 0x04,
-	ANIM_ENDSCENE = 0x80	// When animation ends, dispatch scene end event
+	ANIM_STOPPING = 0x03,
+};
+
+enum AnimationFlags {
+	ANIM_FLAG_NONE = 0x00,
+	ANIM_FLAG_ENDSCENE = 0x01	// When animation ends, dispatch scene end event
 };
 
 // Cutaway info array member. Cutaways are basically animations with a really

Index: ihnm_introproc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/ihnm_introproc.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- ihnm_introproc.cpp	26 Aug 2005 12:07:31 -0000	1.54
+++ ihnm_introproc.cpp	1 Oct 2005 11:09:49 -0000	1.55
@@ -132,7 +132,7 @@
 		q_event = _vm->_events->queue(&event);
 
 		_vm->_anim->setFrameTime(0, IHNM_INTRO_FRAMETIME);
-		_vm->_anim->setFlag(0, ANIM_ENDSCENE);
+		_vm->_anim->setFlag(0, ANIM_FLAG_ENDSCENE);
 
 		event.type = kEvTOneshot;
 		event.code = kAnimEvent;

Index: ite_introproc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/ite_introproc.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- ite_introproc.cpp	10 Aug 2005 15:31:15 -0000	1.68
+++ ite_introproc.cpp	1 Oct 2005 11:09:49 -0000	1.69
@@ -333,7 +333,7 @@
 		for (int i = 0; i < lastAnim; i++)
 			_vm->_anim->link(i, i+1);
 
-		_vm->_anim->setFlag(lastAnim, ANIM_ENDSCENE);
+		_vm->_anim->setFlag(lastAnim, ANIM_FLAG_ENDSCENE);
 
 		debug(3, "Beginning animation playback.");