thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
svn-id: r6371
This commit is contained in:
Max Horn 2003-01-09 17:06:30 +00:00
parent 1934269872
commit 253ddbcfc6
1 changed files with 1 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

15
scumm/script_v8.cpp
View file

@ -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);