[Scummvm-cvs-logs] SF.net SVN: scummvm:[44879] scummvm/trunk/engines/kyra

[athrxx at users.sourceforge.net]

Revision: 44879
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44879&view=rev
Author:   athrxx
Date:     2009-10-10 17:15:10 +0000 (Sat, 10 Oct 2009)

Log Message:
-----------
LOL/PC-98: fixed minor glitch in wsa code

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/lol.cpp
    scummvm/trunk/engines/kyra/screen.cpp

Modified: scummvm/trunk/engines/kyra/lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/lol.cpp	2009-10-10 15:58:51 UTC (rev 44878)
+++ scummvm/trunk/engines/kyra/lol.cpp	2009-10-10 17:15:10 UTC (rev 44879)
@@ -1386,7 +1386,7 @@
 
 			uint32 delayTimer = _system->getMillis() + _tickLength;
 
-			gui_drawLiveMagicBar(barData[type][0] + _activeCharsXpos[charNum], 175, i, 0, pointsMax, 5, 32, barData[type][1], 1, barData[type][3]);
+			gui_drawLiveMagicBar(barData[type][0] + _activeCharsXpos[charNum], 175, i, 0, pointsMax, 5, 32, barData[type][1], _flags.use16ColorMode ? 0x44 : 1, barData[type][3]);
 			_screen->printText(getLangString(barData[type][4]), barData[type][0] + _activeCharsXpos[charNum], 144, barData[type][2], 0);
 			_screen->updateScreen();
 
@@ -3013,7 +3013,7 @@
 		uint32 etime = _system->getMillis() + 4 * _tickLength;
 
 		_screen->copyRegion(0, 0, x, y, w, h, 2, 2, Screen::CR_NO_P_CHECK);
-		mov->displayFrame(frm, 2, x, y, 0x5000, _trueLightTable1, _trueLightTable2);
+		mov->displayFrame(frm, 2, x, y, _flags.use16ColorMode ? 0x4000 : 0x5000, _trueLightTable1, _trueLightTable2);
 		_screen->copyRegion(x, y, x, y, w, h, 2, 0, Screen::CR_NO_P_CHECK);
 		_screen->updateScreen();
 

Modified: scummvm/trunk/engines/kyra/screen.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen.cpp	2009-10-10 15:58:51 UTC (rev 44878)
+++ scummvm/trunk/engines/kyra/screen.cpp	2009-10-10 17:15:10 UTC (rev 44879)
@@ -475,7 +475,8 @@
 	if (_curPage == 0 || _curPage == 1)
 		addDirtyRect(x, y, w, h);
 
-	clearOverlayRect(_curPage, x, y, w, h);
+	if (!_use16ColorMode)
+		clearOverlayRect(_curPage, x, y, w, h);
 
 	temp = h;
 	int curY = y;


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