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

athrxx at users.sourceforge.net athrxx at users.sourceforge.net
Sat Sep 26 23:17:55 CEST 2009


Revision: 44381
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44381&view=rev
Author:   athrxx
Date:     2009-09-26 21:17:47 +0000 (Sat, 26 Sep 2009)

Log Message:
-----------
LOL/PC-98: fix menu colors

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/gui_lol.cpp
    scummvm/trunk/engines/kyra/gui_lol.h
    scummvm/trunk/engines/kyra/screen.cpp

Modified: scummvm/trunk/engines/kyra/gui_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_lol.cpp	2009-09-26 18:25:36 UTC (rev 44380)
+++ scummvm/trunk/engines/kyra/gui_lol.cpp	2009-09-26 21:17:47 UTC (rev 44381)
@@ -1936,6 +1936,7 @@
 GUI_LoL::GUI_LoL(LoLEngine *vm) : GUI(vm), _vm(vm), _screen(vm->_screen) {
 	_scrollUpFunctor = BUTTON_FUNCTOR(GUI_LoL, this, &GUI_LoL::scrollUp);
 	_scrollDownFunctor = BUTTON_FUNCTOR(GUI_LoL, this, &GUI_LoL::scrollDown);
+
 	_redrawButtonFunctor = BUTTON_FUNCTOR(GUI, this, &GUI::redrawButtonCallback);
 	_redrawShadedButtonFunctor = BUTTON_FUNCTOR(GUI, this, &GUI::redrawShadedButtonCallback);
 
@@ -2279,7 +2280,7 @@
 }
 
 int GUI_LoL::redrawButtonCallback(Button *button) {
-	if (!_displayMenu)
+	if (!_displayMenu || _vm->gameFlags().use16ColorMode)
 		return 0;
 
 	_screen->drawBox(button->x + 1, button->y + 1, button->x + button->width - 1, button->y + button->height - 1, 225);
@@ -2287,7 +2288,7 @@
 }
 
 int GUI_LoL::redrawShadedButtonCallback(Button *button) {
-	if (!_displayMenu)
+	if (!_displayMenu || _vm->gameFlags().use16ColorMode)
 		return 0;
 
 	_screen->drawShadedBox(button->x, button->y, button->x + button->width, button->y + button->height, 223, 227, Screen::kShadeTypeLol);
@@ -2452,7 +2453,7 @@
 			_screen->updateScreen();
 		}
 
-		if (_currentMenu == &_mainMenu) {
+		if (_currentMenu == &_mainMenu && !_vm->gameFlags().use16ColorMode) {
 			Screen::FontId f = _screen->setFont(Screen::FID_6_FNT);
 			_screen->fprintString("%s", menu.x + 8, menu.y + menu.height - 12, 204, 0, 8, gScummVMVersion);
 			_screen->setFont(f);
@@ -2580,7 +2581,7 @@
 }
 
 void GUI_LoL::printMenuText(const char *str, int x, int y, uint8 c0, uint8 c1, uint8 flags, Screen::FontId font) {
-	_screen->fprintString("%s", x, y, c0, c1, flags, str);
+	_screen->fprintString("%s", x, y, c0, c1, _vm->gameFlags().use16ColorMode ? flags & 3 : flags, str);
 }
 
 int GUI_LoL::getMenuCenterStringX(const char *str, int x1, int x2) {

Modified: scummvm/trunk/engines/kyra/gui_lol.h
===================================================================
--- scummvm/trunk/engines/kyra/gui_lol.h	2009-09-26 18:25:36 UTC (rev 44380)
+++ scummvm/trunk/engines/kyra/gui_lol.h	2009-09-26 21:17:47 UTC (rev 44381)
@@ -38,15 +38,21 @@
 		menu.y = (dim->sy); \
 		menu.width = (dim->w << 3); \
 		menu.height = (dim->h); \
+		if (_vm->gameFlags().use16ColorMode) { \
+		menu.bkgdColor = 0xcc; \
+		menu.color1 = 0xff; \
+		menu.color2 = 0xdd; \
+		} else { \
 		menu.bkgdColor = 225; \
 		menu.color1 = 223; \
 		menu.color2 = 227; \
+		} \
 		menu.menuNameId = b; \
 		menu.highlightedItem = c; \
 		menu.numberOfItems = d; \
 		menu.titleX = (dim->sx << 3) + (dim->w << 2); \
 		menu.titleY = 6; \
-		menu.textColor = 254; \
+		menu.textColor = _vm->gameFlags().use16ColorMode ? 0xe1 : 254; \
 		menu.scrollUpButtonX = e; \
 		menu.scrollUpButtonY = f; \
 		menu.scrollDownButtonX = g; \
@@ -62,12 +68,18 @@
 		item.y = c; \
 		item.width = d; \
 		item.height = e; \
-		item.textColor = 204; \
-		item.highlightColor = 254; \
+		item.textColor =  _vm->gameFlags().use16ColorMode ? 0xc1 : 204;; \
+		item.highlightColor = _vm->gameFlags().use16ColorMode ? 0xe1 : 254; \
 		item.titleX = -1; \
+		if (_vm->gameFlags().use16ColorMode) { \
+		item.bkgdColor = 0xcc; \
+		item.color1 = 0xff; \
+		item.color2 = 0xdd; \
+		} else { \
 		item.bkgdColor = 225; \
 		item.color1 = 223; \
 		item.color2 = 227; \
+		} \
 		item.saveSlot = 0; \
 		item.labelId = f; \
 		item.labelString = 0; \

Modified: scummvm/trunk/engines/kyra/screen.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen.cpp	2009-09-26 18:25:36 UTC (rev 44380)
+++ scummvm/trunk/engines/kyra/screen.cpp	2009-09-26 21:17:47 UTC (rev 44381)
@@ -1017,6 +1017,9 @@
 	}
 	drawClippedLine(x1, y2, x2, y2, color2);
 
+	if (shadeType == kShadeTypeLol && _use16ColorMode)
+		drawBox(x1, y1, x2, y2, 0);
+
 	showMouse();
 }
 


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