From c67d25cfb9c861ae7c11b06c844a8c16419aa236 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 11 Jan 2004 21:52:24 +0000
Subject: Fix for bug #738352 (DIG: Cursor image appears in upper left corner):
 don't draw flObjects in drawRoomObject(); this may cause regressions (I think
 it would be helpful to compile a list of some/many/all flObjects in all
 games, that would really help with debugging them :-)

svn-id: r12328
---
 scumm/object.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'scumm')

diff --git a/scumm/object.cpp b/scumm/object.cpp
index 56e4b49eaf..8237e8a8d1 100644
--- a/scumm/object.cpp
+++ b/scumm/object.cpp
@@ -350,7 +350,9 @@ void ScummEngine::drawRoomObject(int i, int arg) {
 	do {
 		a = od->parentstate;
 		if (!od->parent) {
-			drawObject(i, arg);
+			// Ignore FlObjects (they are drawn some other place)
+			if (od.od.fl_object_index == 0)
+				drawObject(i, arg);
 			break;
 		}
 		od = &_objs[od->parent];
@@ -402,9 +404,6 @@ void ScummEngine::drawObject(int obj, int arg) {
 	if (_BgNeedsRedraw)
 		arg = 0;
 
-	if (od.obj_nr == 0)
-		return;
-
 	checkRange(_numGlobalObjects - 1, 0, od.obj_nr, "Object %d out of range in drawObject");
 
 	xpos = od.x_pos / 8;
-- 
cgit v1.2.3