From 4794898d29f7add9f7474b9ecd727536c514d4e7 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Fri, 26 May 2006 10:14:06 +0000
Subject: isSpriteLoaded() is used by FF,  a similar function was commented out
 in original code

svn-id: r22653
---
 engines/simon/simon.cpp | 3 +--
 engines/simon/vga.cpp   | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'engines')

diff --git a/engines/simon/simon.cpp b/engines/simon/simon.cpp
index b8c69a41d0..50f9463d84 100644
--- a/engines/simon/simon.cpp
+++ b/engines/simon/simon.cpp
@@ -1780,8 +1780,7 @@ void SimonEngine::loadSprite(uint windowNum, uint zoneNum, uint vgaSpriteId, uin
 
 	_lockWord |= 0x40;
 
-	if ((getGameType() == GType_SIMON1 || getGameType() == GType_SIMON2) &&
-		isSpriteLoaded(vgaSpriteId, zoneNum)) {
+	if (isSpriteLoaded(vgaSpriteId, zoneNum)) {
 		_lockWord &= ~0x40;
 		return;
 	}
diff --git a/engines/simon/vga.cpp b/engines/simon/vga.cpp
index 8d215a84ad..dd381b1887 100644
--- a/engines/simon/vga.cpp
+++ b/engines/simon/vga.cpp
@@ -388,10 +388,8 @@ void SimonEngine::vc3_loadSprite() {
 	y = vcReadNextWord();			/* 6 */
 	palette = vcReadNextWord();		/* 8 */
 
-	if ((getGameType() == GType_SIMON1 || getGameType() == GType_SIMON2) &&
-		isSpriteLoaded(vgaSpriteId, zoneNum)) {
+	if (isSpriteLoaded(vgaSpriteId, zoneNum))
 		return;
-	}
 
 	vsp = _vgaSprites;
 	while (vsp->id)
-- 
cgit v1.2.3