[Scummvm-cvs-logs] CVS: scummvm/backends/dc dcmain.cpp,1.14,1.15 input.cpp,1.10,1.11

Marcus Comstedt marcus_c at users.sourceforge.net
Wed Jul 30 14:45:12 CEST 2003


Update of /cvsroot/scummvm/scummvm/backends/dc
In directory sc8-pr-cvs1:/tmp/cvs-serv5625

Modified Files:
	dcmain.cpp input.cpp 
Log Message:
Merged fixes from branch-0-5-0:

* Max's "adjustment" was incomplete, fixed.
* Initialize shake_pos to 0 (fixes Sky, which never sets the shake_pos).
* Changed sematics of X button to allow boxing in Indy (I hope...)


Index: dcmain.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/dcmain.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- dcmain.cpp	22 Jul 2003 20:36:43 -0000	1.14
+++ dcmain.cpp	30 Jul 2003 21:44:43 -0000	1.15
@@ -44,7 +44,7 @@
 
 OSystem_Dreamcast::OSystem_Dreamcast()
   : screen(NULL), mouse(NULL), overlay(NULL), _ms_buf(NULL),
-    _sound_proc(NULL), _timer_active(false)
+    _sound_proc(NULL), _timer_active(false), _current_shake_pos(0)
 {
   memset(screen_tx, 0, sizeof(screen_tx));
   memset(mouse_tx, 0, sizeof(screen_tx));
@@ -85,7 +85,7 @@
   else if(num_loops<0) num_loops=15; // infinity
   if(!find_track(track, first_sec, last_sec))
     return;
-  if(end_frame)
+  if(duration)
     last_sec = first_sec + start_frame + duration;
   first_sec += start_frame;
   play_cdda_sectors(first_sec, last_sec, num_loops);

Index: input.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/input.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- input.cpp	18 Jun 2003 21:15:08 -0000	1.10
+++ input.cpp	30 Jul 2003 21:44:43 -0000	1.11
@@ -29,6 +29,7 @@
 int handleInput(struct mapledev *pad, int &mouse_x, int &mouse_y,
 		byte &shiftFlags)
 {
+  static const char numpadmap[] = "0000039601740285";
   int lmb=0, rmb=0, newkey=0;
   static int lastkey = 0;
   static byte lastlmb = 0, lastrmb = 0;
@@ -44,7 +45,7 @@
 
       if(!(buttons & 8)) newkey = 319;
       else if(!(buttons & 512)) newkey = ' ';
-      else if(!(buttons & 1024)) newkey = '0';
+      else if(!(buttons & 1024)) newkey = numpadmap[(buttons>>4)&15];
 
       if(!(buttons & 128)) mouse_x++;
       if(!(buttons & 64)) mouse_x--;





More information about the Scummvm-git-logs mailing list