diff options
author | Max Horn | 2003-01-09 17:06:30 +0000 |
---|---|---|
committer | Max Horn | 2003-01-09 17:06:30 +0000 |
commit | 253ddbcfc65194ded8a5b7a1a8982c31c12e28b2 (patch) | |
tree | d4ba6fed3e2e86eb7f636c26540f4181f9cc589a /scumm/script_v8.cpp | |
parent | 1934269872eea22700803ba3e9d53f922a35eb31 (diff) | |
download | scummvm-rg350-253ddbcfc65194ded8a5b7a1a8982c31c12e28b2.tar.gz scummvm-rg350-253ddbcfc65194ded8a5b7a1a8982c31c12e28b2.tar.bz2 scummvm-rg350-253ddbcfc65194ded8a5b7a1a8982c31c12e28b2.zip |
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
svn-id: r6371
Diffstat (limited to 'scumm/script_v8.cpp')
-rw-r--r-- | scumm/script_v8.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp index 7dec6f626c..043e5dbcce 100644 --- a/scumm/script_v8.cpp +++ b/scumm/script_v8.cpp @@ -801,7 +801,6 @@ void Scumm_v8::o8_cursorCommand() _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 @@ void Scumm_v8::o8_cursorCommand() _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 @@ void Scumm_v8::o8_kernelSetFunctions() // 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); |