[Scummvm-cvs-logs] SF.net SVN: scummvm: [27516] scummvm/trunk/engines/agos/draw.cpp
Kirben at users.sourceforge.net
Kirben at users.sourceforge.net
Mon Jun 18 08:12:57 CEST 2007
Revision: 27516
http://scummvm.svn.sourceforge.net/scummvm/?rev=27516&view=rev
Author: Kirben
Date: 2007-06-17 23:12:54 -0700 (Sun, 17 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/trunk/engines/agos/draw.cpp
Modified: scummvm/trunk/engines/agos/draw.cpp
===================================================================
--- scummvm/trunk/engines/agos/draw.cpp 2007-06-17 19:37:07 UTC (rev 27515)
+++ scummvm/trunk/engines/agos/draw.cpp 2007-06-18 06:12:54 UTC (rev 27516)
@@ -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.
More information about the Scummvm-git-logs
mailing list