[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_player.cpp,1.138.2.1,1.138.2.2 smush_player.h,1.37.2.1,1.37.2.2

Nicolas Bacca arisme at users.sourceforge.net
Sat Mar 26 05:16:16 CET 2005


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

Modified Files:
      Tag: branch-0-7-0
	smush_player.cpp smush_player.h 
Log Message:
Tweak WinCE timer re-entry workaround to play Insane sequences

Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.138.2.1
retrieving revision 1.138.2.2
diff -u -d -r1.138.2.1 -r1.138.2.2
--- smush_player.cpp	20 Dec 2004 23:22:23 -0000	1.138.2.1
+++ smush_player.cpp	26 Mar 2005 13:14:32 -0000	1.138.2.2
@@ -218,6 +218,7 @@
 	((SmushPlayer *)refCon)->parseNextFrame();
 #ifdef _WIN32_WCE
 	((SmushPlayer *)refCon)->_inTimer = true;
+	((SmushPlayer *)refCon)->_inTimerCount++;
 #endif
 }
 
@@ -252,6 +253,8 @@
 	_skipPalette = false;
 #ifdef _WIN32_WCE
 	_inTimer = false;
+	_inTimerCount = 0;
+	_inTimerCountRedraw = ConfMan.getInt("Smush_force_redraw");
 #endif
 }
 
@@ -938,8 +941,10 @@
 	end_time = _vm->_system->getMillis();
 
 #ifdef _WIN32_WCE
-	if (!_inTimer)
+	if (!_inTimer || _inTimerCount == _inTimerCountRedraw) {
 		updateScreen();
+		_inTimerCount = 0;
+	}
 #else
 	updateScreen();
 #endif
@@ -1222,6 +1227,7 @@
 			_updateNeeded = false;
 #ifdef _WIN32_WCE
 			_inTimer = false;
+			_inTimerCount = 0;
 #endif
 
 			end_time = _vm->_system->getMillis();

Index: smush_player.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.h,v
retrieving revision 1.37.2.1
retrieving revision 1.37.2.2
diff -u -d -r1.37.2.1 -r1.37.2.2
--- smush_player.h	20 Dec 2004 23:22:23 -0000	1.37.2.1
+++ smush_player.h	26 Mar 2005 13:14:33 -0000	1.37.2.2
@@ -79,6 +79,8 @@
 	bool _skipPalette;
 #ifdef _WIN32_WCE
 	bool _inTimer;
+	int16 _inTimerCount;
+	int16 _inTimerCountRedraw;
 #endif
 
 public:





More information about the Scummvm-git-logs mailing list