From df07d2db297b263142a0505d880e57b17e681a97 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Tue, 10 Jan 2012 22:11:11 +0100
Subject: SCUMM: fix a regression in v0

Found by segra.
---
 engines/scumm/object.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp
index 670b2cb79c..26597864fd 100644
--- a/engines/scumm/object.cpp
+++ b/engines/scumm/object.cpp
@@ -1223,7 +1223,8 @@ uint32 ScummEngine::getOBCDOffs(int object) const {
 		return 0;
 
 	for (i = (_numLocalObjects-1); i > 0; i--) {
-		if (_objs[i].obj_nr == OBJECT_V0_NR(object)) {
+		int nr = (_game.version != 0) ? object : OBJECT_V0_NR(object);
+		if (_objs[i].obj_nr == nr) {
 			if (_game.version == 0 && _objs[i].obj_type != OBJECT_V0_TYPE(object))
 				continue;
 			if (_objs[i].fl_object_index != 0)
-- 
cgit v1.2.3