aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/scumm/script_v0.cpp7
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) {