[Scummvm-cvs-logs] SF.net SVN: scummvm:[39632] scummvm/trunk/engines/parallaction

[Kirben at users.sourceforge.net]

Revision: 39632
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39632&view=rev
Author:   Kirben
Date:     2009-03-23 12:30:47 +0000 (Mon, 23 Mar 2009)

Log Message:
-----------
Fix pallete for label font in the Amiga version of BRA.

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/exec_br.cpp
    scummvm/trunk/engines/parallaction/graphics.cpp

Modified: scummvm/trunk/engines/parallaction/exec_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/exec_br.cpp	2009-03-23 11:38:09 UTC (rev 39631)
+++ scummvm/trunk/engines/parallaction/exec_br.cpp	2009-03-23 12:30:47 UTC (rev 39632)
@@ -89,10 +89,11 @@
 	// FIXME: render subtitles using the right color (10 instead of 0).
 	// The original game features a nasty hack, having the font rendering routine
 	// replacing color 12 of font RUSSIA with 10 when preparing subtitles.
-	_subtitle[0] = _gfx->createLabel(_labelFont, s, 0);
+	uint8 color = (_vm->getPlatform() == Common::kPlatformAmiga) ? 11 : 0;
+	_subtitle[0] = _gfx->createLabel(_labelFont, s, color);
 	_gfx->showLabel(_subtitle[0], CENTER_LABEL_HORIZONTAL, _subtitleY);
 	if (s2) {
-		_subtitle[1] = _gfx->createLabel(_labelFont, s2, 0);
+		_subtitle[1] = _gfx->createLabel(_labelFont, s2, color);
 		_gfx->showLabel(_subtitle[1], CENTER_LABEL_HORIZONTAL, _subtitleY + 5 + _labelFont->height());
 	} else {
 		_subtitle[1] = -1;

Modified: scummvm/trunk/engines/parallaction/graphics.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/graphics.cpp	2009-03-23 11:38:09 UTC (rev 39631)
+++ scummvm/trunk/engines/parallaction/graphics.cpp	2009-03-23 12:30:47 UTC (rev 39632)
@@ -529,18 +529,18 @@
 	Graphics::Surface *cnv = new Graphics::Surface;
 
 	uint w, h;
-	if (_vm->getGameType() == GType_Nippon && _vm->getPlatform() == Common::kPlatformAmiga) {
+	if (_vm->getPlatform() == Common::kPlatformAmiga) {
 		w = font->getStringWidth(text) + 16;
-		h = 10;
+		h = font->height() + 2;
 
 		setupLabelSurface(*cnv, w, h);
 
-		font->setColor(7);
+		font->setColor((_vm->getGameType() == GType_BRA) ? 0 : 7);
 		font->drawString((byte*)cnv->pixels + 1, cnv->w, text);
 		font->drawString((byte*)cnv->pixels + 1 + cnv->w * 2, cnv->w, text);
 		font->drawString((byte*)cnv->pixels + cnv->w, cnv->w, text);
 		font->drawString((byte*)cnv->pixels + 2 + cnv->w, cnv->w, text);
-		font->setColor(1);
+		font->setColor((_vm->getGameType() == GType_BRA) ? 11 : 1);
 		font->drawString((byte*)cnv->pixels + 1 + cnv->w, cnv->w, text);
 	} else {
 		w = font->getStringWidth(text);


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