[Scummvm-cvs-logs] CVS: scummvm/backends/dc dc.h,1.13,1.14 display.cpp,1.9,1.10

[Marcus Comstedt]

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

Modified Files:
	dc.h display.cpp 
Log Message:
Hires mouse pointer (CoMI).

Index: dc.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/dc.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- dc.h	5 Jul 2003 15:17:45 -0000	1.13
+++ dc.h	14 Jul 2003 21:44:01 -0000	1.14
@@ -108,7 +108,7 @@
   void *_sound_proc_param;
   bool _overlay_visible, _overlay_dirty, _screen_dirty;
   int _screen_buffer, _overlay_buffer, _mouse_buffer;
-  bool _hires;
+  bool _hires, _hires_mouse;
   float _overlay_fade;
 
   uint32 _timer_duration, _timer_next_expiry;

Index: display.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/display.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- display.cpp	18 Jun 2003 21:15:08 -0000	1.9
+++ display.cpp	14 Jul 2003 21:44:01 -0000	1.10
@@ -154,6 +154,7 @@
   _overlay_y = (h-OVL_H)/2;
   if(_overlay_x<0) _overlay_x = 0;
   if(_overlay_y<0) _overlay_y = 0;
+  _hires_mouse = _hires;
   ta_sync();
   if(!screen)
     screen = new unsigned char[SCREEN_W*SCREEN_H];
@@ -469,24 +470,49 @@
   myvertex.u = 0.0;
   myvertex.v = 0.0;
 
-  myvertex.x = (xdraw-_ms_hotspot_y)*2.0;
-  myvertex.y = (ydraw-_ms_hotspot_x)*2.0 + TOP_OFFSET;
-  ta_commit_list(&myvertex);
+  if(_hires_mouse) {
 
-  myvertex.x += w*2.0;
-  myvertex.u = w*(1.0/MOUSE_W);
-  ta_commit_list(&myvertex);
+    myvertex.x = xdraw*2.0-_ms_hotspot_x;
+    myvertex.y = ydraw*2.0-_ms_hotspot_y + TOP_OFFSET;
+    ta_commit_list(&myvertex);
 
-  myvertex.x = (xdraw-_ms_hotspot_y)*2.0;
-  myvertex.y += h*2.0;
-  myvertex.u = 0.0;
-  myvertex.v = h*(1.0/MOUSE_H);
-  ta_commit_list(&myvertex);
+    myvertex.x += w;
+    myvertex.u = w*(1.0/MOUSE_W);
+    ta_commit_list(&myvertex);
 
-  myvertex.x += w*2.0;
-  myvertex.u = w*(1.0/MOUSE_W);
-  myvertex.cmd |= TA_CMD_VERTEX_EOS;
-  ta_commit_list(&myvertex);
+    myvertex.x = xdraw*2.0-_ms_hotspot_x;
+    myvertex.y += h;
+    myvertex.u = 0.0;
+    myvertex.v = h*(1.0/MOUSE_H);
+    ta_commit_list(&myvertex);
+    
+    myvertex.x += w;
+    myvertex.u = w*(1.0/MOUSE_W);
+    myvertex.cmd |= TA_CMD_VERTEX_EOS;
+    ta_commit_list(&myvertex);
+
+  } else {
+
+    myvertex.x = (xdraw-_ms_hotspot_x)*2.0;
+    myvertex.y = (ydraw-_ms_hotspot_y)*2.0 + TOP_OFFSET;
+    ta_commit_list(&myvertex);
+
+    myvertex.x += w*2.0;
+    myvertex.u = w*(1.0/MOUSE_W);
+    ta_commit_list(&myvertex);
+
+    myvertex.x = (xdraw-_ms_hotspot_x)*2.0;
+    myvertex.y += h*2.0;
+    myvertex.u = 0.0;
+    myvertex.v = h*(1.0/MOUSE_H);
+    ta_commit_list(&myvertex);
+    
+    myvertex.x += w*2.0;
+    myvertex.u = w*(1.0/MOUSE_W);
+    myvertex.cmd |= TA_CMD_VERTEX_EOS;
+    ta_commit_list(&myvertex);
+
+  }
 }