From c9ae5f383807c1f40088fc042d470bf8ba74f1da Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Tue, 27 Dec 2011 08:47:00 +0100
Subject: SCUMM: Fix pickupObject()

---
 engines/scumm/script_v0.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'engines/scumm/script_v0.cpp')

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) {
-- 
cgit v1.2.3