diff options
| author | Travis Howell | 2004-01-15 06:25:57 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-01-15 06:25:57 +0000 |
| commit | 9854ab9344b8113a6308b4be8d125b707177f12f (patch) | |
| tree | 0a4f4c0abf91b2918fee5388eccc671b14da017e | |
| parent | 5a876510e76fe4b968aed583350284591e6306f9 (diff) | |
| download | scummvm-rg350-9854ab9344b8113a6308b4be8d125b707177f12f.tar.gz scummvm-rg350-9854ab9344b8113a6308b4be8d125b707177f12f.tar.bz2 scummvm-rg350-9854ab9344b8113a6308b4be8d125b707177f12f.zip | |
Add correct fix for puttputt
svn-id: r12401
| -rw-r--r-- | scumm/script.cpp | 7 | ||||
| -rw-r--r-- | scumm/script_v6.cpp | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/scumm/script.cpp b/scumm/script.cpp index 6d54677e9c..36cd30f77f 100644 --- a/scumm/script.cpp +++ b/scumm/script.cpp @@ -664,10 +664,11 @@ void ScummEngine::runInventoryScript(int i) { if (_version <= 2) { redrawV2Inventory(); } else { - int tmp[16]; - tmp[0] = i; + int args[16]; + memset(args, 0, sizeof(args)); + args[0] = i; if (VAR(VAR_INVENTORY_SCRIPT)) { - runScript(VAR(VAR_INVENTORY_SCRIPT), 0, 0, tmp); + runScript(VAR(VAR_INVENTORY_SCRIPT), 0, 0, args); } } } diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index 17c0f44f4f..abf6b601d7 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -1930,10 +1930,6 @@ void ScummEngine_v6::o6_verbOps() { case 139: // SO_VERB_IMAGE_IN_ROOM b = pop(); a = pop(); - // HACK Prevent puttmoon from loading non existant objects - if ((_gameId == GID_PUTTPUTT) && (a > 900)) - break; - if (slot && a != vs->imgindex) { setVerbObject(b, a, slot); vs->type = kImageVerbType; |