Ticket #8155: comi-cannon.diff

scummvm/backends/sdl/sdl-common.cpp

@@ -398 +398 @@
                 undraw_mouse();
         }
 }
+
+void OSystem_SDL_Common::warp_mouse(int x, int y) {
+        // FIXME: For whatever reason, I can't get CMI's cannon scene to work
+        // properly in fullscreen mode unless I temporarily show the mouse
+        // cursor here.
+        if (_full_screen) SDL_ShowCursor(SDL_ENABLE);
+        SDL_WarpMouse(x * _scaleFactor, y * _scaleFactor);
+        if (_full_screen) SDL_ShowCursor(SDL_DISABLE);
+        set_mouse_pos(x, y);
+}
         
 void OSystem_SDL_Common::set_mouse_cursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y) {
 

scummvm/backends/sdl/sdl-common.h

@@ -52 +52 @@
         
         // Set the position of the mouse cursor
         void set_mouse_pos(int x, int y);
+
+        // Warp the mouse cursor. Where set_mouse_pos() only informs the
+        // backend of the mouse cursor's current position, this function
+        // actually moves the cursor to the specified position.
+        void warp_mouse(int x, int y);
         
         // Set the bitmap that's used when drawing the cursor.
         void set_mouse_cursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y);

scummvm/common/system.h

@@ -109 +109 @@
         
         // Set the position of the mouse cursor
         virtual void set_mouse_pos(int x, int y) = 0;
+
+        // Warp the mouse cursor. Where set_mouse_pos() only informs the
+        // backend of the mouse cursor's current position, this function
+        // actually moves the cursor to the specified position.
+        virtual void warp_mouse(int x, int y) = 0;
         
         // Set the bitmap that's used when drawing the cursor.
         virtual void set_mouse_cursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y) = 0;

scummvm/scumm/script_v8.cpp

@@ -801 +801 @@
                         _charsetColorMap[i] = _charsetData[_string[1].t_charset][i] = (unsigned char)args[i];
                 break;
         case 0xE9:              // SO_CURSOR_PUT
-                _virtual_mouse_x = pop();
                 _virtual_mouse_y = pop();
+                _virtual_mouse_x = pop();
 
                 mouse.x = _virtual_mouse_x - virtscr[0].xstart;
                 mouse.y = _virtual_mouse_y - camera._cur.y + (_realHeight / 2);
-                mouse.y += 16;
+                mouse.y += virtscr[0].topline;
 
-                _system->set_mouse_pos(mouse.x, mouse.y);
+                _system->warp_mouse(mouse.x, mouse.y);
                 _system->update_screen();
 //              warning("warped mouse to (%d, %d) from %d-%d", _virtual_mouse_x, _virtual_mouse_y, _roomResource, vm.slot[_currentScript].number);
                 break;