[Scummvm-cvs-logs] SF.net SVN: scummvm: [27518] scummvm/branches/branch-0-10-0/engines/agos/ draw.cpp

[Kirben at users.sourceforge.net]

Revision: 27518
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27518&view=rev
Author:   Kirben
Date:     2007-06-18 01:31:30 -0700 (Mon, 18 Jun 2007)

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

Modified Paths:
--------------
    scummvm/branches/branch-0-10-0/engines/agos/draw.cpp

Modified: scummvm/branches/branch-0-10-0/engines/agos/draw.cpp
===================================================================
--- scummvm/branches/branch-0-10-0/engines/agos/draw.cpp	2007-06-18 07:06:24 UTC (rev 27517)
+++ scummvm/branches/branch-0-10-0/engines/agos/draw.cpp	2007-06-18 08:31:30 UTC (rev 27518)
@@ -166,28 +166,29 @@
 		_vgaSpriteChanged++;
 	}
 
-	if ((getGameType() == GType_ELVIRA1 && !_variableArray[293]) ||
-		(getGameType() == GType_ELVIRA2 && !_variableArray[71]) &&
-		_wallOn) {
-		_wallOn--;
+	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;
+			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;
+			_windowNum = 4;
 
-		_backFlag = 1;
-		drawImage(&state);
-		_backFlag = 0;
+			_backFlag = 1;
+			drawImage(&state);
+			_backFlag = 0;
 
-		_vgaSpriteChanged++;
+			_vgaSpriteChanged++;
+		}
 	}
 
 	if (!_scrollFlag && !_vgaSpriteChanged) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.