[Scummvm-cvs-logs] CVS: scummvm/sword2/driver animation.cpp,1.31,1.32

Max Horn fingolfin at users.sourceforge.net
Sun Mar 21 17:51:03 CET 2004


Update of /cvsroot/scummvm/scummvm/sword2/driver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14982/sword2/driver

Modified Files:
	animation.cpp 
Log Message:
some more cleanup

Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/animation.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- animation.cpp	22 Mar 2004 01:28:45 -0000	1.31
+++ animation.cpp	22 Mar 2004 01:40:24 -0000	1.32
@@ -222,14 +222,18 @@
 				if (bgSoundStream && !bgSound.isActive())
 					return false;
 
-#ifdef BACKEND_8BIT
 				if (checkPaletteSwitch() || (bgSoundStream == NULL) ||
-					((_snd->getChannelElapsedTime(bgSound) * 12) / 1000 < framenum + 1) || frameskipped > 10) {
+					((_snd->getChannelElapsedTime(bgSound) * 12) / 1000 < framenum + 1) ||
+					frameskipped > 10) {
 					if (frameskipped > 10) {
 						warning("force frame %i redraw", framenum);
 						frameskipped = 0;
 					}
+#ifdef BACKEND_8BIT
 					_vm->_graphics->plotYUV(lut, sequence_i->width, sequence_i->height, info->display_fbuf->buf);
+#else
+					plotYUV(lookup, sequence_i->width, sequence_i->height, info->display_fbuf->buf);
+#endif
 
 					if (bgSoundStream) {
 						while ((_snd->getChannelElapsedTime(bgSound) * 12) / 1000 < framenum)
@@ -239,38 +243,17 @@
 						_vm->sleepUntil(ticks);
 					}
 
+#ifdef BACKEND_8BIT
 					_vm->_graphics->setNeedFullRedraw();
+#endif
 
 				} else {
 					warning("dropped frame %i", framenum);
 					frameskipped++;
 				}
 
+#ifdef BACKEND_8BIT
 				buildLookup(palnum + 1, lutcalcnum);
-
-#else
-
-				if ((bgSoundStream == NULL) ||
-					((_snd->getChannelElapsedTime(bgSound) * 12) / 1000 < framenum + 1) || frameskipped > 10) {
-					if (frameskipped > 10) {
-						warning("force frame %i redraw", framenum);
-						frameskipped = 0;
-					}
-					plotYUV(lookup, sequence_i->width, sequence_i->height, info->display_fbuf->buf);
-
-					if (bgSoundStream) {
-						while ((_snd->getChannelElapsedTime(bgSound) * 12) / 1000 < framenum)
-							_sys->delay_msecs(10);
-					} else {
-						ticks += 83;
-						_vm->sleepUntil(ticks);
-					}
-
-				} else {
-					warning("dropped frame %i", framenum);
-					frameskipped++;
-				}
-
 #endif
 
 				framenum++;





More information about the Scummvm-git-logs mailing list