[Scummvm-cvs-logs] CVS: scummvm/scumm script_v8.cpp,2.75,2.76

James Brown ender at users.sourceforge.net
Fri Dec 27 21:37:04 CET 2002


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

Modified Files:
	script_v8.cpp 
Log Message:
Correct cursor put opcode slightly


Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.75
retrieving revision 2.76
diff -u -d -r2.75 -r2.76
--- script_v8.cpp	28 Dec 2002 05:26:21 -0000	2.75
+++ script_v8.cpp	28 Dec 2002 05:36:52 -0000	2.76
@@ -823,15 +823,16 @@
 			_charsetColorMap[i] = _charsetData[_string[1].t_charset][i] = (unsigned char)args[i];
 		break;
 	case 0xE9: 		// SO_CURSOR_PUT
-		mouse.x = pop();
-		mouse.y = pop();
-	        _virtual_mouse_x = mouse.x + virtscr[0].xstart;
-                _virtual_mouse_y = mouse.y + camera._cur.y - (_realHeight / 2);
-		_virtual_mouse_y -= 16;
+	        _virtual_mouse_x = pop();
+		_virtual_mouse_y = pop();
+
+		mouse.x = _virtual_mouse_x - virtscr[0].xstart;
+		mouse.y = _virtual_mouse_y - camera._cur.y + (_realHeight / 2);
+		mouse.y += 16;
 
 		_system->set_mouse_pos(mouse.x, mouse.y);
 		_system->update_screen();
-		warning("warped mouse to (%d, %d)", mouse.x, mouse.y);
+		warning("warped mouse to (%d, %d) from %d-%d", _virtual_mouse_x, _virtual_mouse_y, _roomResource, vm.slot[_currentScript].number);
 		break;
 	default:
 		error("o8_cursorCommand: default case %d", subOp);





More information about the Scummvm-git-logs mailing list