aboutsummaryrefslogtreecommitdiff
path: root/scumm/script_v8.cpp
diff options
context:
space:
mode:
authorJames Brown2003-01-16 12:47:34 +0000
committerJames Brown2003-01-16 12:47:34 +0000
commitc24c1270f65f655ccc409950aff1c521f9bb8785 (patch)
treedcc2c94cab46601a71ae777e3c40d4c98c9ca381 /scumm/script_v8.cpp
parentf4dc8c5b1ba65a07efcaf3c14fa4596bcc5f1f07 (diff)
downloadscummvm-rg350-c24c1270f65f655ccc409950aff1c521f9bb8785.tar.gz
scummvm-rg350-c24c1270f65f655ccc409950aff1c521f9bb8785.tar.bz2
scummvm-rg350-c24c1270f65f655ccc409950aff1c521f9bb8785.zip
Some cleanup, implementation of setKeyScript (F1 now attempts to start the save/load menu, albiet fails due to a crash in BlastText)
svn-id: r6480
Diffstat (limited to 'scumm/script_v8.cpp')
-rw-r--r--scumm/script_v8.cpp18
1 files changed, 15 insertions, 3 deletions
diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp
index 4270403ad9..e1ed2b6f95 100644
--- a/scumm/script_v8.cpp
+++ b/scumm/script_v8.cpp
@@ -1466,7 +1466,8 @@ void Scumm_v8::o8_kernelSetFunctions()
warning("o8_kernelSetFunctions: saveGameStampScreenshot(%d, %d, %d, %d, %d, %d)", args[1], args[2], args[3], args[4], args[5], args[6]);
break;
case 29: // setKeyScript
- warning("o8_kernelSetFunctions: setKeyScript(%d, %d)", args[1], args[2]);
+ keyScriptKey = args[1];
+ keyScriptNo = args[2];
break;
case 30: // killAllScriptsButMe
warning("o8_kernelSetFunctions: killAllScriptsButMe()");
@@ -1515,8 +1516,19 @@ void Scumm_v8::o8_kernelGetFunctions()
case 0x74: // isPointInBox
push(checkXYInBoxBounds(args[3], args[1], args[2]));
break;
- case 0xCE: // getRGBSlot
case 0xD3: // getKeyState
+ switch(args[1]) {
+ case 0x14B: // Left Arrow depressed?
+ case 0x14D: // Right Arrow depressed?
+ push(0);
+ break;
+ default:
+ warning("getKeyState(0x%X)\n", args[1]);
+ push(0);
+ break;
+ }
+ break;
+ case 0xCE: // getRGBSlot
case 0xD7: // getBox
push(0);
warning("o8_kernelGetFunctions: default case 0x%x (len = %d)", args[0], len);
@@ -1541,8 +1553,8 @@ void Scumm_v8::o8_kernelGetFunctions()
break;
}
case 0xD9: // actorHit
+ warning("actorHit(%d,%d,%d)", args[3], args[2], args[1]);
push(0);
- warning("o8_kernelGetFunctions: default case 0x%x (len = %d)", args[0], len);
break;
case 0xDA: // lipSyncWidth
case 0xDB: // lipSyncHeight