aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2002-12-25 02:12:12 +0000
committerMax Horn2002-12-25 02:12:12 +0000
commitbf41dbdba3c24b438e516850a8ba6ca584b2a82b (patch)
tree681d26215f60b3fcb9981a500a123240f9bfd0d9
parent2c01dc85369a1246521cc6d4d5c6e749ccc8999b (diff)
downloadscummvm-rg350-bf41dbdba3c24b438e516850a8ba6ca584b2a82b.tar.gz
scummvm-rg350-bf41dbdba3c24b438e516850a8ba6ca584b2a82b.tar.bz2
scummvm-rg350-bf41dbdba3c24b438e516850a8ba6ca584b2a82b.zip
filled in f-kludge stuff, and make it push(0) - now we don't crash anymore
svn-id: r6112
-rw-r--r--scumm/script_v8.cpp26
1 files changed, 19 insertions, 7 deletions
diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp
index a1326158b4..3b3b21d874 100644
--- a/scumm/script_v8.cpp
+++ b/scumm/script_v8.cpp
@@ -264,10 +264,10 @@ void Scumm_v8::setupOpcodes()
OPCODE(o8_soundKludge),
OPCODE(o8_system),
/* B4 */
+ OPCODE(o6_saveRestoreVerbs),
OPCODE(o6_invalid),
OPCODE(o6_invalid),
- OPCODE(o6_invalid),
- OPCODE(o6_invalid),
+ OPCODE(o6_drawBox),
/* B8 */
OPCODE(o6_invalid),
OPCODE(o6_invalid),
@@ -311,7 +311,7 @@ void Scumm_v8::setupOpcodes()
/* D8 */
OPCODE(o8_kludge2),
OPCODE(o6_invalid),
- OPCODE(o6_invalid),
+ OPCODE(o6_getVerbEntrypoint),
OPCODE(o6_getActorFromXY),
/* DC */
OPCODE(o6_findObject),
@@ -493,6 +493,7 @@ void Scumm_v8::decodeParseString(int m, int n)
break;
case 0xCD: // SO_PRINT_CHARSET Set print character set
// FIXME - TODO
+ pop();
break;
case 0xCE:
_string[m].center = false;
@@ -1171,13 +1172,24 @@ void Scumm_v8::o8_kludge2()
getStackList(args, sizeof(args) / sizeof(args[0]));
switch (args[0]) {
- case 0xE0:
- // TODO - ReadRegistryValue
- push(0);
- break;
+ case 0xCE: // getRGBSlot
+ case 0xD3: // getKeyState
+ case 0xD7: // getBox
+ case 0xD8: // findBlastObject
+ case 0xD9: // actorHit
+ case 0xDA: // lipSyncWidth
+ case 0xDB: // lipSyncHeight
+ case 0xDC: // actorTalkAnimation
+ case 0xDD: // getMasterSFXVol
+ case 0xDE: // getMasterVoiceVol
+ case 0xDF: // getMasterMusicVol
+ case 0xE0: // readRegistryValue
default:
+ // FIXME - hack!
+ push(0);
warning("o8_kludge2: default case %d", args[0]);
}
+
}
void Scumm_v8::o8_getObjectImageX()