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

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Sat Aug 18 03:59:19 CEST 2007


Revision: 28648
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28648&view=rev
Author:   thebluegr
Date:     2007-08-17 18:59:18 -0700 (Fri, 17 Aug 2007)

Log Message:
-----------
Corrected some of the colors in the save/load dialogs in IHNM

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

Modified: scummvm/trunk/engines/saga/interface.cpp
===================================================================
--- scummvm/trunk/engines/saga/interface.cpp	2007-08-17 13:10:57 UTC (rev 28647)
+++ scummvm/trunk/engines/saga/interface.cpp	2007-08-18 01:59:18 UTC (rev 28648)
@@ -960,7 +960,10 @@
 	rect2 = rect;
 	fontHeight = _vm->_font->getHeight(kKnownFontSmall);
 	for (j = 0; j < _vm->getDisplayInfo().optionSaveFileVisible; j++) {
-		bgColor = kITEColorDarkGrey0C;
+		if (_vm->getGameType() == GType_ITE)
+			bgColor = kITEColorDarkGrey0C;
+		else
+			bgColor = kIHNMColorBlack;
 		fgColor = kITEColorBrightWhite;
 
 		idx = j + _optionSaveFileTop;
@@ -1233,10 +1236,10 @@
 	while ((ch[0] = _textInputString[i++]) != 0) {
 		rect.setWidth(_vm->_font->getStringWidth(kKnownFontSmall, ch, 0, kFontNormal));
 		if ((i == _textInputPos) && _textInput) {
-			fgColor = kITEColorBlack;
-			ds->fillRect(rect, kITEColorWhite);
+			fgColor = _vm->KnownColor2ColorId(kKnownColorBlack);
+			ds->fillRect(rect, _vm->KnownColor2ColorId(kKnownColorWhite));
 		} else {
-			fgColor = kITEColorWhite;
+			fgColor = _vm->KnownColor2ColorId(kKnownColorWhite);
 		}
 		textPoint.x = rect.left;
 		textPoint.y = rect.top + 1;
@@ -1247,7 +1250,7 @@
 	if (_textInput && (_textInputPos >= i)) {
 		ch[0] = ' ';
 		rect.setWidth(_vm->_font->getStringWidth(kKnownFontSmall, ch, 0, kFontNormal));
-		ds->fillRect(rect, kITEColorWhite);
+		ds->fillRect(rect, _vm->KnownColor2ColorId(kKnownColorWhite));
 	}
 }
 

Modified: scummvm/trunk/engines/saga/saga.cpp
===================================================================
--- scummvm/trunk/engines/saga/saga.cpp	2007-08-17 13:10:57 UTC (rev 28647)
+++ scummvm/trunk/engines/saga/saga.cpp	2007-08-18 01:59:18 UTC (rev 28648)
@@ -428,6 +428,9 @@
 		case (kKnownColorBrightWhite):
 			colorId = kITEColorBrightWhite;
 			break;
+		case (kKnownColorWhite):
+			colorId = kITEColorWhite;
+			break;
 		case (kKnownColorBlack):
 			colorId = kITEColorBlack;
 			break;
@@ -458,6 +461,9 @@
 		case (kKnownColorBrightWhite):
 			colorId = kITEColorBrightWhite;
 			break;
+		case (kKnownColorWhite):
+			colorId = kITEColorBrightWhite;
+			break;			
 		case (kKnownColorBlack):
 			colorId = kIHNMColorBlack;
 			break;

Modified: scummvm/trunk/engines/saga/saga.h
===================================================================
--- scummvm/trunk/engines/saga/saga.h	2007-08-17 13:10:57 UTC (rev 28647)
+++ scummvm/trunk/engines/saga/saga.h	2007-08-18 01:59:18 UTC (rev 28648)
@@ -441,6 +441,7 @@
 enum KnownColor {
 	kKnownColorTransparent,
 	kKnownColorBrightWhite,	
+	kKnownColorWhite,	
 	kKnownColorBlack,
 
 	kKnownColorSubtitleTextColor,


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




More information about the Scummvm-git-logs mailing list