[Scummvm-cvs-logs] scummvm master -> 78ba3210a57094086d44b25d5a8507c33ce9bef3

athrxx athrxx at scummvm.org
Thu Apr 18 22:17:25 CEST 2013


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
78ba3210a5 KYRA: (LOL) - fix bug in last commit for scene_lol.cpp


Commit: 78ba3210a57094086d44b25d5a8507c33ce9bef3
    https://github.com/scummvm/scummvm/commit/78ba3210a57094086d44b25d5a8507c33ce9bef3
Author: athrxx (athrxx at scummvm.org)
Date: 2013-04-18T13:15:25-07:00

Commit Message:
KYRA: (LOL) - fix bug in last commit for scene_lol.cpp

Changed paths:
    engines/kyra/scene_lol.cpp



diff --git a/engines/kyra/scene_lol.cpp b/engines/kyra/scene_lol.cpp
index c8618bc..154606d 100644
--- a/engines/kyra/scene_lol.cpp
+++ b/engines/kyra/scene_lol.cpp
@@ -315,7 +315,7 @@ void LoLEngine::loadLevelGraphics(const char *file, int specialColor, int weight
 		if (_lastSpecialColor == 1)
 			_lastSpecialColor = 0x44;
 		else if (_lastSpecialColor == 0x66)
-			_lastSpecialColor = file ? (scumm_stricmp(file, "YVEL2") ? 0xCC : 0x44) : 0x44;
+			_lastSpecialColor = scumm_stricmp(_lastBlockDataFile, "YVEL2") ? 0xCC : 0x44;
 		else if (_lastSpecialColor == 0x6B)
 			_lastSpecialColor = 0xCC;
 		else






More information about the Scummvm-git-logs mailing list