diff options
| author | Max Horn | 2002-12-30 01:40:12 +0000 |
|---|---|---|
| committer | Max Horn | 2002-12-30 01:40:12 +0000 |
| commit | 2a1e07f3e56c1797b4e9ab820a8aa3c09121110c (patch) | |
| tree | 233af7857ddb57a775194ab66bec07297acf8a9b | |
| parent | f167eafee65cdc3f19c716ed2fbdbe56edddc52e (diff) | |
| download | scummvm-rg350-2a1e07f3e56c1797b4e9ab820a8aa3c09121110c.tar.gz scummvm-rg350-2a1e07f3e56c1797b4e9ab820a8aa3c09121110c.tar.bz2 scummvm-rg350-2a1e07f3e56c1797b4e9ab820a8aa3c09121110c.zip | |
added two V8 opcodes; more meaningful error message
svn-id: r6269
| -rw-r--r-- | scumm/boxes.cpp | 4 | ||||
| -rw-r--r-- | scumm/script_v8.cpp | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/scumm/boxes.cpp b/scumm/boxes.cpp index c680227deb..5821eb6eee 100644 --- a/scumm/boxes.cpp +++ b/scumm/boxes.cpp @@ -169,7 +169,7 @@ Box *Scumm::getBoxBaseAddr(int box) return (Box *)(ptr + box * SIZEOF_BOX + 2); } -int Scumm::getSpecialBox(int param1, int param2) +int Scumm::getSpecialBox(int x, int y) { int i; int numOfBoxes; @@ -183,7 +183,7 @@ int Scumm::getSpecialBox(int param1, int param2) if (!(flag & kBoxInvisible) && (flag & kBoxPlayerOnly)) return (-1); - if (checkXYInBoxBounds(i, param1, param2)) + if (checkXYInBoxBounds(i, x, y)) return (i); } diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp index 87a85da2fb..022d03d44f 100644 --- a/scumm/script_v8.cpp +++ b/scumm/script_v8.cpp @@ -572,7 +572,7 @@ void Scumm_v8::decodeParseString(int m, int n) error("decodeParseString: SO_PRINT_MUMBLE"); break; default: - error("decodeParseString: default case"); + error("decodeParseString: default case %d", b); } } @@ -1385,12 +1385,6 @@ void Scumm_v8::o6_kernelSetFunctions() case 109: // setPaletteShadow setupShadowPalette(0, args[1], args[2], args[3], args[4], args[5]); break; - case 115: // getWalkBoxAt - warning("o6_kernelSetFunctions: getWalkBoxAt (len = %d)", len); - break; - case 116: // isPointInBox - warning("o6_kernelSetFunctions: isPointInBox (len = %d)", len); - break; case 118: // blastShadowObject enqueueObject(args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], 3); break; @@ -1399,7 +1393,7 @@ void Scumm_v8::o6_kernelSetFunctions() break; default: - warning("o6_kernelSetFunctions: default case (len = %d)", len); + warning("o6_kernelSetFunctions: default case %d (len = %d)", args[0], len); } } @@ -1410,6 +1404,12 @@ void Scumm_v8::o6_kernelGetFunctions() int len = getStackList(args, sizeof(args) / sizeof(args[0])); switch (args[0]) { + case 0x73: // getWalkBoxAt + push(getSpecialBox(args[1], args[2])); + break; + case 0x74: // isPointInBox + push(checkXYInBoxBounds(args[3], args[1], args[2])); + break; case 0xCE: // getRGBSlot case 0xD3: // getKeyState case 0xD7: // getBox @@ -1453,7 +1453,7 @@ void Scumm_v8::o6_kernelGetFunctions() } break; default: - error("o6_kernelGetFunctions: default case (len = %d)", len); + error("o6_kernelGetFunctions: default case %d (len = %d)", args[0], len); } } |