From b0201a8df24462b95c786826793e46583349ee1c Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sun, 22 Jan 2012 23:06:07 +0100
Subject: SCUMM: fix o_setObjectName()

The parameter can either be a FG or BG object depending on the opcode.
---
 engines/scumm/script_v0.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

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

diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index 9fd8397596..a04f23aea8 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -756,9 +756,16 @@ void ScummEngine_v0::o_pickupObject() {
 }
 
 void ScummEngine_v0::o_setObjectName() {
-	int obj = fetchScriptByte();
-	if (!obj)
+	int obj;
+	int objId = fetchScriptByte();
+	if (!objId) {
 		obj = _cmdObject;
+	} else {
+		if (_opcode & 0x80)
+			obj = OBJECT_V0(objId, kObjectV0TypeBG);
+		else
+			obj = OBJECT_V0(objId, kObjectV0TypeFG);
+	}
 	setObjectName(obj);
 }
 
-- 
cgit v1.2.3