Fix bugs #1738867 and #1738872, the code for clearing the effects of fire wall and ice wall spells was always enabled.

svn-id: r27516

1 files changed, 23 insertions, 22 deletions

diff --git a/engines/agos/draw.cpp b/engines/agos/draw.cpp
index 4598b4f2ab..9be0691853 100644
--- a/engines/agos/draw.cpp
+++ b/engines/agos/draw.cpp
@@ -166,28 +166,29 @@ void AGOSEngine::animateSprites() {
 		_vgaSpriteChanged++;
 	}
 
-	if ((getGameType() == GType_ELVIRA1 && !_variableArray[293]) ||
-		(getGameType() == GType_ELVIRA2 && !_variableArray[71]) &&
-		_wallOn) {
-		_wallOn--;
-
-		VC10_state state;
-		state.srcPtr  = getBackGround() + 3 * _screenWidth + 3 * 16;
-		state.height = state.draw_height = 127;
-		state.width = state.draw_width = 14;
-		state.y = 0;
-		state.x = 0;
-		state.palette = 0;
-		state.paletteMod = 0;
-		state.flags = kDFNonTrans;
-
-		_windowNum = 4;
-
-		_backFlag = 1;
-		drawImage(&state);
-		_backFlag = 0;
-
-		_vgaSpriteChanged++;
+	if (getGameType() == GType_ELVIRA1 || getGameType() == GType_ELVIRA2) {
+		const uint8 var = (getGameType() == GType_ELVIRA1) ? 293 : 71;
+		if (_wallOn && !_variableArray[var]) {
+			_wallOn--;
+
+			VC10_state state;
+			state.srcPtr  = getBackGround() + 3 * _screenWidth + 3 * 16;
+			state.height = state.draw_height = 127;
+			state.width = state.draw_width = 14;
+			state.y = 0;
+			state.x = 0;
+			state.palette = 0;
+			state.paletteMod = 0;
+			state.flags = kDFNonTrans;
+
+			_windowNum = 4;
+
+			_backFlag = 1;
+			drawImage(&state);
+			_backFlag = 0;
+
+			_vgaSpriteChanged++;
+		}
 	}
 
 	if (!_scrollFlag && !_vgaSpriteChanged) {