thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCUMM: Fix inventory problem when offering items to other characters.

Browse source 
If you offered an object to someone, e.g. one of the guards at Castle
Brunwald, then clicked "Never mind" instead, the next time you tried you
would only see one inventory object. This seems to be because unlike the
DOS version (at least the 256-color version), script 12 only enables
verb 101, not the whole inventory.

Perhaps the Mac version treated the inventory as a single verb?
This commit is contained in:
Torbjörn Andersson 2021-06-23 16:36:12 +02:00 • committed by Torbjörn Andersson
parent 49b58ae946
commit 671a169153
1 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

20
engines/scumm/script_v5.cpp
View file

@ -2377,7 +2377,25 @@ void ScummEngine_v5::o5_verbOps() {
vs->origLeft = vs->curRect.left; vs->origLeft = vs->curRect.left;
break; break;
case 6: // SO_VERB_ON case 6: // SO_VERB_ON
vs->curmode = 1; // It seems that the Mac version of Indiana Jones and
// the Last Crusade treats the entire inventory as a
// single verb, or at least that's my guess as far as
// script 12 is concerned. In the 256-color DOS
// version (I don't have the EGA version), the script
// enables all inventory verbs, and possibly the
// inventory arrows. Well, that's what the hard-coded
// inventory script does, so this should be fine.
//
// This fixes a problem where if you offer an object
// to someone and then press "Never mind", the next
// time you try you see only one inventory object.
//
// I don't know if it has to be limited to this
// particular script, but that's what I'll do for now.
if (_game.id == GID_INDY3 && _game.platform == Common::kPlatformMacintosh && verb == 101 && vm.slot[_currentScript].number == 12) {
inventoryScriptIndy3Mac();
} else
vs->curmode = 1;
break; break;
case 7: // SO_VERB_OFF case 7: // SO_VERB_OFF
vs->curmode = 0; vs->curmode = 0;