[Scummvm-cvs-logs] SF.net SVN: scummvm: [29929] scummvm/trunk/engines/saga

[thebluegr at users.sourceforge.net]

Revision: 29929
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29929&view=rev
Author:   thebluegr
Date:     2007-12-20 11:17:00 -0800 (Thu, 20 Dec 2007)

Log Message:
-----------
Fix for bug #1851030 - "IHNM Spanish CD - Wrong Dialogs color"

Modified Paths:
--------------
    scummvm/trunk/engines/saga/interface.cpp
    scummvm/trunk/engines/saga/saga.h

Modified: scummvm/trunk/engines/saga/interface.cpp
===================================================================
--- scummvm/trunk/engines/saga/interface.cpp	2007-12-20 19:02:16 UTC (rev 29928)
+++ scummvm/trunk/engines/saga/interface.cpp	2007-12-20 19:17:00 UTC (rev 29929)
@@ -2118,7 +2118,7 @@
 			break;
 		default:
 			cornerColor = 0x8b;
-			frameColor = (_vm->getGameType() == GType_ITE) ? kITEColorBlack : kIHNMColorBlack;
+			frameColor = _vm->KnownColor2ColorId(kKnownColorBlack);
 			solidColor = fillColor = kITEColorLightBlue96;
 			odl = kITEColorDarkBlue8a;
 			our = kITEColorLightBlue94;
@@ -2472,8 +2472,8 @@
 		bulletForegnd = kITEColorGreen;
 		bulletBackgnd = kITEColorBlack;
 	} else {
-		bulletForegnd = kITEColorBrightWhite;
-		bulletBackgnd = kIHNMColorBlack;
+		bulletForegnd = _vm->KnownColor2ColorId(kKnownColorBrightWhite);
+		bulletBackgnd = _vm->KnownColor2ColorId(kKnownColorBlack);
 		bullet[0] = '>';				// different bullet in IHNM
 	}
 
@@ -2483,7 +2483,7 @@
 	if (_vm->getGameType() == GType_ITE)
 		ds->drawRect(rect, kITEColorDarkGrey);	//fill bullet place
 	else
-		ds->drawRect(rect, kIHNMColorBlack);	//fill bullet place
+		ds->drawRect(rect, _vm->KnownColor2ColorId(kKnownColorBlack));	//fill bullet place
 
 	for (int i = 0; i < _vm->getDisplayInfo().converseTextLines; i++) {
 		relPos = _converseStartPos + i;
@@ -2497,16 +2497,16 @@
 				foregnd = kITEColorBrightWhite;
 				backgnd = (!_vm->leftMouseButtonPressed()) ? kITEColorDarkGrey : kITEColorGrey;
 			} else {
-				foregnd = kIHNMColorRed;
-				backgnd = (!_vm->leftMouseButtonPressed()) ? kIHNMColorRed : kIHNMColorRed;
+				foregnd = _vm->KnownColor2ColorId(kKnownColorVerbTextActive);
+				backgnd = _vm->KnownColor2ColorId(kKnownColorVerbTextActive);
 			}
 		} else {
 			if (_vm->getGameType() == GType_ITE) {
 				foregnd = kITEColorBlue;
 				backgnd = kITEColorDarkGrey;
 			} else {
-				foregnd = kITEColorBrightWhite;
-				backgnd = kIHNMColorBlack;
+				foregnd = _vm->KnownColor2ColorId(kKnownColorBrightWhite);
+				backgnd = _vm->KnownColor2ColorId(kKnownColorBlack);
 			}
 		}
 
@@ -2530,7 +2530,7 @@
 		if (_vm->getGameType() == GType_ITE)
 			_vm->_font->textDraw(kKnownFontSmall, ds, str, textPoint, foregnd, kITEColorBlack, kFontShadow);
 		else
-			_vm->_font->textDraw(kKnownFontVerb, ds, str, textPoint, foregnd, kIHNMColorBlack, kFontShadow);
+			_vm->_font->textDraw(kKnownFontVerb, ds, str, textPoint, foregnd, _vm->KnownColor2ColorId(kKnownColorBlack), kFontShadow);
 	}
 
 	if (_converseStartPos != 0) {

Modified: scummvm/trunk/engines/saga/saga.h
===================================================================
--- scummvm/trunk/engines/saga/saga.h	2007-12-20 19:02:16 UTC (rev 29928)
+++ scummvm/trunk/engines/saga/saga.h	2007-12-20 19:17:00 UTC (rev 29929)
@@ -443,10 +443,7 @@
 	kITEColorLightBlue96 = 0x96,
 	kITEColorGreen = 0xba,
 
-	kIHNMColorBlack = 0xfa,
-	kIHNMColorPortrait = 0xfe,
-	kIHNMColorWhite = 0x20,
-	kIHNMColorRed = 0x11
+	kIHNMColorPortrait = 0xfe
 };
 
 enum KnownColor {


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