[Scummvm-cvs-logs] CVS: scummvm/backends/dc input.cpp,1.21,1.21.2.1 dcmain.cpp,1.29,1.29.2.1

Marcus Comstedt marcus_c at users.sourceforge.net
Wed Dec 15 14:33:04 CET 2004


Update of /cvsroot/scummvm/scummvm/backends/dc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20486

Modified Files:
      Tag: release-0-7-0
	input.cpp dcmain.cpp 
Log Message:
Fixed input event starvation bug.

Index: input.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/input.cpp,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -u -d -r1.21 -r1.21.2.1
--- input.cpp	9 Dec 2004 20:21:31 -0000	1.21
+++ input.cpp	15 Dec 2004 22:32:46 -0000	1.21.2.1
@@ -183,11 +183,15 @@
     _timer_next_expiry = t+USEC_TO_TIMER(1000*_timer_duration);
   }
 
+  if(!_devpoll)
+    _devpoll = t;
   if(((int)(t-_devpoll))<0)
     return false;
   _devpoll += USEC_TO_TIMER(17000);
   if(((int)(t-_devpoll))>=0)
     _devpoll = t + USEC_TO_TIMER(17000);
+  if(!_devpoll)
+    ++ _devpoll;
 
   int mask = getimask();
   setimask(15);

Index: dcmain.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/dcmain.cpp,v
retrieving revision 1.29
retrieving revision 1.29.2.1
diff -u -d -r1.29 -r1.29.2.1
--- dcmain.cpp	9 Dec 2004 20:21:31 -0000	1.29
+++ dcmain.cpp	15 Dec 2004 22:32:46 -0000	1.29.2.1
@@ -48,7 +48,8 @@
 OSystem_Dreamcast::OSystem_Dreamcast()
   : screen(NULL), mouse(NULL), overlay(NULL), _softkbd(this), _ms_buf(NULL),
     _sound_proc(NULL), _timer_active(false), _current_shake_pos(0),
-    _aspect_stretch(false), _softkbd_on(false), _softkbd_motion(0)
+    _aspect_stretch(false), _softkbd_on(false), _softkbd_motion(0),
+    _devpoll(0)
 {
   memset(screen_tx, 0, sizeof(screen_tx));
   memset(mouse_tx, 0, sizeof(mouse_tx));





More information about the Scummvm-git-logs mailing list