[Scummvm-cvs-logs] CVS: scummvm/saga events.cpp,1.41,1.42 events.h,1.14,1.15 ite_introproc.cpp,1.41,1.42

[Torbjörn Andersson]

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

Modified Files:
	events.cpp events.h ite_introproc.cpp 
Log Message:
Pausing an animation is done by changing its state now, not by setting a
flag. Added yet another event, and changed the ITE intro to reflect that.
(Which means the waterfalls are no longer drawn over the game title.)


Index: events.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/events.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- events.cpp	2 Jan 2005 14:52:00 -0000	1.41
+++ events.cpp	2 Jan 2005 15:45:38 -0000	1.42
@@ -329,6 +329,9 @@
 		case EVENT_PLAY:
 			_vm->_anim->play(event->param, event->time, true);
 			break;
+		case EVENT_STOP:
+			_vm->_anim->stop(event->param);
+			break;
 		case EVENT_FRAME:
 			_vm->_anim->play(event->param, event->time, false);
 			break;

Index: events.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/events.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- events.h	2 Jan 2005 14:36:00 -0000	1.14
+++ events.h	2 Jan 2005 15:45:38 -0000	1.15
@@ -65,9 +65,10 @@
 	EVENT_DISPLAY = 1,
 	// ANIM events
 	// EVENT_PLAY = 1, // reused
-	EVENT_FRAME = 2,
-	EVENT_SETFLAG = 3,
-	EVENT_CLEARFLAG = 4,
+	// EVENT_STOP = 2, // reused
+	EVENT_FRAME = 3,
+	EVENT_SETFLAG = 4,
+	EVENT_CLEARFLAG = 5,
 	// MUISC & SOUND events
 	EVENT_PLAY = 1,
 	EVENT_STOP = 2,

Index: ite_introproc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/ite_introproc.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- ite_introproc.cpp	2 Jan 2005 14:52:01 -0000	1.41
+++ ite_introproc.cpp	2 Jan 2005 15:45:38 -0000	1.42
@@ -680,9 +680,8 @@
 		// Pause animation before logo
 		event.type = ONESHOT_EVENT;
 		event.code = ANIM_EVENT;
-		event.op = EVENT_SETFLAG;
+		event.op = EVENT_STOP;
 		event.param = 0;
-		event.param2 = ANIM_PAUSE;
 		event.time = 3000;
 
 		q_event = _vm->_events->chain(q_event, &event);
@@ -708,18 +707,9 @@
 		// Unpause animation before logo
 		event.type = ONESHOT_EVENT;
 		event.code = ANIM_EVENT;
-		event.op = EVENT_CLEARFLAG;
-		event.param = 0;
-		event.param2 = ANIM_PAUSE;
+		event.op = EVENT_PLAY;
 		event.time = 0;
-
-		q_event = _vm->_events->chain(q_event, &event);
-
-		event.type = ONESHOT_EVENT;
-		event.code = ANIM_EVENT;
-		event.op = EVENT_FRAME;
 		event.param = 0;
-		event.time = LOGO_DISSOLVE_DURATION;
 
 		q_event = _vm->_events->chain(q_event, &event);