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

[lordhoto at users.sourceforge.net]

Revision: 43215
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43215&view=rev
Author:   lordhoto
Date:     2009-08-10 18:04:53 +0000 (Mon, 10 Aug 2009)

Log Message:
-----------
Fix GUI menu colors for Kyrandia 1 Amiga.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/items_lok.cpp
    scummvm/trunk/engines/kyra/staticres.cpp

Modified: scummvm/trunk/engines/kyra/items_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/items_lok.cpp	2009-08-10 18:03:54 UTC (rev 43214)
+++ scummvm/trunk/engines/kyra/items_lok.cpp	2009-08-10 18:04:53 UTC (rev 43215)
@@ -920,19 +920,19 @@
 	// The first item names are mapped directly
 	else if (item <= 28)
 		return item;
-	// There's only one string for all "Fireberries"
+	// There's only one string for "Fireberries"
 	else if (item >= 29 && item <= 33)
 		return 29;
 	// Correct offsets
 	else if (item >= 34 && item <= 59)
 		return item - 4;
-	// There's only one string for all "Red Potion"
+	// There's only one string for "Red Potion"
 	else if (item >= 60 && item <= 61)
 		return 56;
-	// There's only one string for all "Blue Potion"
+	// There's only one string for "Blue Potion"
 	else if (item >= 62 && item <= 63)
 		return 57;
-	// There's only one string for all "Yellow Potion"
+	// There's only one string for "Yellow Potion"
 	else if (item >= 64 && item <= 65)
 		return 58;
 	// Correct offsets

Modified: scummvm/trunk/engines/kyra/staticres.cpp
===================================================================
--- scummvm/trunk/engines/kyra/staticres.cpp	2009-08-10 18:03:54 UTC (rev 43214)
+++ scummvm/trunk/engines/kyra/staticres.cpp	2009-08-10 18:04:53 UTC (rev 43215)
@@ -2254,6 +2254,22 @@
 	_menu[5].item[2].callback = BUTTON_FUNCTOR(GUI_LoK, this, &GUI_LoK::controlsChangeWalk);
 	_menu[5].item[4].callback = BUTTON_FUNCTOR(GUI_LoK, this, &GUI_LoK::controlsChangeText);
 	_menu[5].item[5].callback = BUTTON_FUNCTOR(GUI_LoK, this, &GUI_LoK::controlsApply);
+
+	// The AMIGA version uses different colors, due to its 32 color nature. We did setup the 256 color version
+	// colors above, so we need to overwrite those with the correct values over here.
+	if (_vm->gameFlags().platform == Common::kPlatformAmiga) {
+		for (int i = 0; i < 6; ++i) {
+			_menu[i].bkgdColor = 17;
+			_menu[i].color1 = 31;
+			_menu[i].color2 = 18;
+
+			for (int j = 0; j < _menu[i].numberOfItems; ++j) {
+				_menu[i].item[j].bkgdColor = 17;
+				_menu[i].item[j].color1 = 31;
+				_menu[i].item[j].color2 = 18;
+			}
+		}
+	}
 }
 
 void KyraEngine_LoK::setupButtonData() {


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