[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_player.cpp,1.149,1.150 smush_player.h,1.43,1.44
Nicolas Bacca
arisme at users.sourceforge.net
Sat Mar 26 05:24:32 CET 2005
Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv432
Modified Files:
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.149
retrieving revision 1.150
diff -u -d -r1.149 -r1.150
--- smush_player.cpp 12 Mar 2005 18:55:45 -0000 1.149
+++ smush_player.cpp 26 Mar 2005 13:23:01 -0000 1.150
@@ -220,6 +220,7 @@
((SmushPlayer *)refCon)->parseNextFrame();
#ifdef _WIN32_WCE
((SmushPlayer *)refCon)->_inTimer = true;
+ ((SmushPlayer *)refCon)->_inTimerCount++;
#endif
}
@@ -254,6 +255,8 @@
_skipPalette = false;
#ifdef _WIN32_WCE
_inTimer = false;
+ _inTimerCount = 0;
+ _inTimerCountRedraw = ConfMan.getInt("Smush_force_redraw");
#endif
}
@@ -948,8 +951,10 @@
end_time = _vm->_system->getMillis();
#ifdef _WIN32_WCE
- if (!_inTimer)
+ if (!_inTimer || _inTimerCount == _inTimerCountRedraw) {
updateScreen();
+ _inTimerCount = 0;
+ }
#else
updateScreen();
#endif
@@ -1249,6 +1254,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.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- smush_player.h 12 Mar 2005 18:55:45 -0000 1.43
+++ smush_player.h 26 Mar 2005 13:23:01 -0000 1.44
@@ -78,6 +78,8 @@
bool _skipPalette;
#ifdef _WIN32_WCE
bool _inTimer;
+ int16 _inTimerCount;
+ int16 _inTimerCountRedraw;
#endif
Common::Mutex _mutex;
More information about the Scummvm-git-logs
mailing list