diff options
author | James Brown | 2002-11-02 12:39:42 +0000 |
---|---|---|
committer | James Brown | 2002-11-02 12:39:42 +0000 |
commit | 65029389832572f2fa7e4e36b303c57e2b9b6d56 (patch) | |
tree | 6294a0eb59ff704632bc6e2b32a3fe25fddfcda2 | |
parent | 53f26cb4acc192b1526d0db44c3a603e5933e6a0 (diff) | |
download | scummvm-rg350-65029389832572f2fa7e4e36b303c57e2b9b6d56.tar.gz scummvm-rg350-65029389832572f2fa7e4e36b303c57e2b9b6d56.tar.bz2 scummvm-rg350-65029389832572f2fa7e4e36b303c57e2b9b6d56.zip |
Fix some really stupid code someone added - this basically fixes the FT derby, except for keyboard control
svn-id: r5382
-rw-r--r-- | scumm/script_v2.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp index b73e1ea916..52a957f577 100644 --- a/scumm/script_v2.cpp +++ b/scumm/script_v2.cpp @@ -3033,7 +3033,7 @@ void Scumm::o6_kernelFunction() Actor *a; getStackList(args, sizeof(args) / sizeof(args[0])); - + printf("kernel(%d)\n", args[0]); switch (args[0]) { case 113: // This is used for the Sam & Max paint-by-numbers mini-game @@ -3057,19 +3057,19 @@ void Scumm::o6_kernelFunction() push(remapPaletteColor(args[1], args[2], args[3], (uint) - 1)); break; case 207: - i = getObjectIndex(pop()); + i = getObjectIndex(args[1]); push(_objs[i].x_pos); break; case 208: - i = getObjectIndex(pop()); + i = getObjectIndex(args[1]); push(_objs[i].y_pos); break; case 209: - i = getObjectIndex(pop()); + i = getObjectIndex(args[1]); push(_objs[i].width); break; case 210: - i = getObjectIndex(pop()); + i = getObjectIndex(args[1]); push(_objs[i].height); break; case 211: @@ -3091,7 +3091,7 @@ void Scumm::o6_kernelFunction() break; } - warning("o6_kernelFunction: getInput(%d)", args[1]); + warning("o6_kernelFunction: getInput(%d) against %d", args[1], _lastKeyHit); push(0); break; case 212: |