[Scummvm-cvs-logs] CVS: scummvm/saga ite_introproc.cpp,1.37,1.38 saga.h,1.58,1.59 scene.cpp,1.64,1.65 scene.h,1.26,1.27 sfuncs.cpp,1.57,1.58

[Eugene Sandulenko]

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

Modified Files:
	ite_introproc.cpp saga.h scene.cpp scene.h sfuncs.cpp 
Log Message:
PALETTE_FADE_DURATION -> kNormalFadeDuration


Index: ite_introproc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/ite_introproc.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- ite_introproc.cpp	28 Dec 2004 13:34:33 -0000	1.37
+++ ite_introproc.cpp	29 Dec 2004 19:40:58 -0000	1.38
@@ -663,7 +663,7 @@
 
 		// Begin title screen background animation 
 		_vm->_anim->setCycles(0, -1);
-		_vm->_anim->play(0, PALETTE_FADE_DURATION);
+		_vm->_anim->play(0, kNormalFadeDuration);
 
 		// Begin ITE title theme music
 		_vm->_music->stop();

Index: saga.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.h,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- saga.h	28 Dec 2004 21:27:17 -0000	1.58
+++ saga.h	29 Dec 2004 19:40:59 -0000	1.59
@@ -79,7 +79,9 @@
 
 enum scriptTimings {
 	kScriptTimeTicksPerSecond = (728L/10L),
-	kRepeatSpeed = 40   // 25 frames/sec
+	kRepeatSpeed = 40,   // 25 frames/sec
+	kNormalFadeDuration = 1000, // should be 320. 64 steps, 5 msec each
+	kQuickFadeDuration = 200  // should be 64. 64 steps, 1 msec each
 };
 
 enum Directions {

Index: scene.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/scene.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- scene.cpp	28 Dec 2004 21:27:17 -0000	1.64
+++ scene.cpp	29 Dec 2004 19:40:59 -0000	1.65
@@ -599,7 +599,7 @@
 		event.code = PAL_EVENT;
 		event.op = EVENT_PALTOBLACK;
 		event.time = 0;
-		event.duration = PALETTE_FADE_DURATION;
+		event.duration = kNormalFadeDuration;
 		event.data = current_pal;
 		q_event = _vm->_events->queue(&event);
 
@@ -642,7 +642,7 @@
 		event.code = PAL_EVENT;
 		event.op = EVENT_BLACKTOPAL;
 		event.time = 0;
-		event.duration = PALETTE_FADE_DURATION;
+		event.duration = kNormalFadeDuration;
 		event.data = _bg.pal;
 
 		q_event = _vm->_events->chain(q_event, &event);

Index: scene.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/scene.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- scene.h	28 Dec 2004 21:33:46 -0000	1.26
+++ scene.h	29 Dec 2004 19:40:59 -0000	1.27
@@ -60,8 +60,6 @@
 
 typedef int (SCENE_PROC) (int, SCENE_INFO *, void *);
 
-#define PALETTE_FADE_DURATION 1000
-
 enum SCENE_LOAD_FLAGS {
 	BY_RESOURCE = 0,
 	BY_SCENE,

Index: sfuncs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sfuncs.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- sfuncs.cpp	29 Dec 2004 16:10:53 -0000	1.57
+++ sfuncs.cpp	29 Dec 2004 19:40:59 -0000	1.58
@@ -931,7 +931,7 @@
 
 	_vm->_gfx->showCursor(false);
 	_vm->_gfx->getCurrentPal(cur_pal);
-	_vm->_gfx->palToBlackWait(back_buf, cur_pal, PALETTE_FADE_DURATION);
+	_vm->_gfx->palToBlackWait(back_buf, cur_pal, kNormalFadeDuration);
 
 	_vm->_interface->setStatusText("");
 
@@ -949,7 +949,7 @@
 	_vm->_render->drawScene();
 
 	_vm->_scene->getBGPal(&pal);
-	_vm->_gfx->blackToPalWait(back_buf, pal, PALETTE_FADE_DURATION);
+	_vm->_gfx->blackToPalWait(back_buf, pal, kNormalFadeDuration);
 
 	return SUCCESS;
 }
@@ -963,7 +963,7 @@
 	// Fade down
 	_vm->_gfx->showCursor(false);
 	_vm->_gfx->getCurrentPal(cur_pal);
-	_vm->_gfx->palToBlackWait(back_buf, cur_pal, PALETTE_FADE_DURATION);
+	_vm->_gfx->palToBlackWait(back_buf, cur_pal, kNormalFadeDuration);
 
 	_vm->_render->clearFlag(RF_PLACARD);
 	_vm->_render->drawScene();
@@ -972,7 +972,7 @@
 	_vm->_scene->getBGPal(&pal);
 
 	_vm->_gfx->showCursor(true);
-	_vm->_gfx->blackToPalWait(back_buf, pal, PALETTE_FADE_DURATION);
+	_vm->_gfx->blackToPalWait(back_buf, pal, kNormalFadeDuration);
 
 	return SUCCESS;
 }