aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorJohannes Schickel2009-09-20 23:38:35 +0000
committerJohannes Schickel2009-09-20 23:38:35 +0000
commitc9d8146c64b3884dab0582c781d586ed13ebb7b3 (patch)
tree69415a1786cb8ebb2bcda9c823d75df7db44b724 /engines
parent44359cd920b0b8e5591dacd002f1f6f62682d74d (diff)
downloadscummvm-rg350-c9d8146c64b3884dab0582c781d586ed13ebb7b3.tar.gz
scummvm-rg350-c9d8146c64b3884dab0582c781d586ed13ebb7b3.tar.bz2
scummvm-rg350-c9d8146c64b3884dab0582c781d586ed13ebb7b3.zip
Fix compilation under Linux.
svn-id: r44226
Diffstat (limited to 'engines')
-rw-r--r--engines/kyra/scene_lol.cpp2
-rw-r--r--engines/kyra/screen_lol.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/kyra/scene_lol.cpp b/engines/kyra/scene_lol.cpp
index 022caa7da7..bbcc0b22ee 100644
--- a/engines/kyra/scene_lol.cpp
+++ b/engines/kyra/scene_lol.cpp
@@ -359,7 +359,7 @@ void LoLEngine::loadLevelGraphics(const char *file, int specialColor, int weight
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
diff --git a/engines/kyra/screen_lol.cpp b/engines/kyra/screen_lol.cpp
index 7b752a7b14..ead33b0cff 100644
--- a/engines/kyra/screen_lol.cpp
+++ b/engines/kyra/screen_lol.cpp
@@ -207,7 +207,7 @@ uint8 *Screen_LoL::generateLevelOverlay(const Palette &srcPal, uint8 *ovl, int o
}
if (c <= m) {
- if (!_use16ColorMode || x != opColor && i != x) {
+ if (!_use16ColorMode || (x != opColor && i != x)) {
m = c;
l = x;
}