[Scummvm-cvs-logs] CVS: scummvm/scumm script_v8.cpp,2.101,2.102
Max Horn
fingolfin at users.sourceforge.net
Thu Jan 9 09:07:05 CET 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv1077/scumm
Modified Files:
script_v8.cpp
Log Message:
change seems to work on Linux in windowed mode; works on OS X in window/FS mode. Same problem as the old code in FS on Linux, though
Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.101
retrieving revision 2.102
diff -u -d -r2.101 -r2.102
--- script_v8.cpp 9 Jan 2003 16:57:09 -0000 2.101
+++ script_v8.cpp 9 Jan 2003 17:06:30 -0000 2.102
@@ -801,7 +801,6 @@
_charsetColorMap[i] = _charsetData[_string[1].t_charset][i] = (unsigned char)args[i];
break;
case 0xE9: // SO_CURSOR_PUT
-#if 1
{
int y = pop();
int x = pop();
@@ -809,18 +808,6 @@
_system->warp_mouse(x, y);
_system->update_screen();
}
-#else
- _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 += virtscr[0].topline;
-
- _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);
-#endif
break;
default:
error("o8_cursorCommand: default case 0x%x", subOp);
@@ -1379,7 +1366,7 @@
// The problem here is that args[4] is always 0, as it is computed from
// lipSyncWidth and lipSyncHeight, which we currently don't support. As a result,
// actors will currently not move their mouth at all!
- warning("o8_kernelSetFunctions: setActorChoreLimbFrame(%d, %d, %d, %d)", args[1], args[2], args[3], args[4]);
+// warning("o8_kernelSetFunctions: setActorChoreLimbFrame(%d, %d, %d, %d)", args[1], args[2], args[3], args[4]);
a = derefActorSafe(args[1], "o8_kernelSetFunctions:setActorChoreLimbFrame");
assert(a);
More information about the Scummvm-git-logs
mailing list