diff options
| author | Tobias Gunkel | 2011-12-27 08:47:00 +0100 |
|---|---|---|
| committer | Tobias Gunkel | 2012-02-11 08:02:30 +0100 |
| commit | c9ae5f383807c1f40088fc042d470bf8ba74f1da (patch) | |
| tree | ac13bba879249e7215e6cbd52b11ff894aac8efd | |
| parent | 3e2012483d9543e9e5f65fcbf038e9d2f915639f (diff) | |
| download | scummvm-rg350-c9ae5f383807c1f40088fc042d470bf8ba74f1da.tar.gz scummvm-rg350-c9ae5f383807c1f40088fc042d470bf8ba74f1da.tar.bz2 scummvm-rg350-c9ae5f383807c1f40088fc042d470bf8ba74f1da.zip | |
SCUMM: Fix pickupObject()
| -rw-r--r-- | engines/scumm/script_v0.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp index 71dfbc6a82..cc59e608fd 100644 --- a/engines/scumm/script_v0.cpp +++ b/engines/scumm/script_v0.cpp @@ -777,7 +777,12 @@ void ScummEngine_v0::o_putActorAtObject() { void ScummEngine_v0::o_pickupObject() { int obj = fetchScriptByte(); if (obj == 0) { - obj = _activeObject; + if (_activeObject) { + obj = _activeObject; + } else { + // might happen if an inventory item was picked again + return; + } } if (obj < 1) { |