[Scummvm-cvs-logs] CVS: scummvm/scumm script_v8.cpp,2.98,2.99

[James Brown]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv7492/scumm

Modified Files:
	script_v8.cpp 
Log Message:
Patch 664895: Cannon fixes. Yippie. Anyone here familiar enough with SDL to comment on the fullscreen hack?


Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.98
retrieving revision 2.99
diff -u -d -r2.98 -r2.99
--- script_v8.cpp	8 Jan 2003 22:47:44 -0000	2.98
+++ script_v8.cpp	9 Jan 2003 08:06:35 -0000	2.99
@@ -801,14 +801,14 @@
 			_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;