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

[lordhoto at users.sourceforge.net]

Revision: 44226
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44226&view=rev
Author:   lordhoto
Date:     2009-09-20 23:38:35 +0000 (Sun, 20 Sep 2009)

Log Message:
-----------
Fix compilation under Linux.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/scene_lol.cpp
    scummvm/trunk/engines/kyra/screen_lol.cpp

Modified: scummvm/trunk/engines/kyra/scene_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_lol.cpp	2009-09-20 23:35:10 UTC (rev 44225)
+++ scummvm/trunk/engines/kyra/scene_lol.cpp	2009-09-20 23:38:35 UTC (rev 44226)
@@ -359,7 +359,7 @@
 
 	if (_flags.use16ColorMode) {
 		if (_lastSpecialColor == 0x66)
-			_lastSpecialColor = stricmp(file, "YVEL2") ? 0xcc : 0x44;
+			_lastSpecialColor = scumm_stricmp(file, "YVEL2") ? 0xcc : 0x44;
 		else if (_lastSpecialColor == 0x6b)
 			_lastSpecialColor = 0xcc;
 		else

Modified: scummvm/trunk/engines/kyra/screen_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen_lol.cpp	2009-09-20 23:35:10 UTC (rev 44225)
+++ scummvm/trunk/engines/kyra/screen_lol.cpp	2009-09-20 23:38:35 UTC (rev 44226)
@@ -207,7 +207,7 @@
 				}
 
 				if (c <= m) {
-					if (!_use16ColorMode || x != opColor && i != x) {
+					if (!_use16ColorMode || (x != opColor && i != x)) {
 						m = c;
 						l = x;
 					}


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