From 92e788dbb60e782151a81f33c22185b5de37b6b3 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Mon, 23 Mar 2009 12:30:47 +0000
Subject: Fix pallete for label font in the Amiga version of BRA.

svn-id: r39632
---
 engines/parallaction/exec_br.cpp  | 5 +++--
 engines/parallaction/graphics.cpp | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/engines/parallaction/exec_br.cpp b/engines/parallaction/exec_br.cpp
index 836dd14f7d..b0421f497a 100644
--- a/engines/parallaction/exec_br.cpp
+++ b/engines/parallaction/exec_br.cpp
@@ -89,10 +89,11 @@ void Parallaction_br::setupSubtitles(char *s, char *s2, int y) {
 	// 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;
diff --git a/engines/parallaction/graphics.cpp b/engines/parallaction/graphics.cpp
index 0f3ebfb5f2..078f696f3b 100644
--- a/engines/parallaction/graphics.cpp
+++ b/engines/parallaction/graphics.cpp
@@ -529,18 +529,18 @@ uint Gfx::renderFloatingLabel(Font *font, char *text) {
 	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);
-- 
cgit v1.2.3