fixed comi smush subtitles colors

svn-id: r6518

2 files changed, 26 insertions, 9 deletions

diff --git a/scumm/smush/frenderer.cpp b/scumm/smush/frenderer.cpp
index 6c3978fb5d..75cf14aa7b 100644
--- a/scumm/smush/frenderer.cpp
+++ b/scumm/smush/frenderer.cpp
@@ -22,6 +22,7 @@
 #include <stdafx.h>
 #include "common/util.h"
 #include "common/engine.h" // for debug, warning, error
+#include "scumm/scumm.h"
 
 #include "frenderer.h"
 
@@ -98,16 +99,32 @@ int32 FontRenderer::drawChar(char * buffer, const Point & size, int32 x, int32 y
 		}
 	} else {
 		char color = (_color != -1) ? _color : 1;
-		for(int32 j = 0; j < h; j++) {
-			for(int32 i = 0; i < w; i++) {
-				char value = *src++;
-				if(value == 1) {
-					dst[i] = color;
-				} else if(value) {
-					dst[i] = 0;
+		if (g_scumm->_gameId == GID_CMI) {
+			for(int32 j = 0; j < h; j++) {
+				for(int32 i = 0; i < w; i++) {
+					char value = *src++;
+					if(value == -color) {
+						dst[i] = -1;
+					} else if(value == -31) {
+						dst[i] = 0;
+					} else if(value) {
+						dst[i] = value;
+					}
 				}
+				dst += size.getX();
+			}
+		} else {
+			for(int32 j = 0; j < h; j++) {
+				for(int32 i = 0; i < w; i++) {
+					char value = *src++;
+					if(value == 1) {
+						dst[i] = color;
+					} else if(value) {
+						dst[i] = 0;
+					}
+				}
+				dst += size.getX();
 			}
-			dst += size.getX();
 		}
 	}
 	return w;
diff --git a/scumm/smush/player.cpp b/scumm/smush/player.cpp
index 1940c64c21..881dcfc90d 100644
--- a/scumm/smush/player.cpp
+++ b/scumm/smush/player.cpp
@@ -843,7 +843,7 @@ bool SmushPlayer::play(const char * file, const char * directory) {
 			for(int i = 0; i < 5; i++) {
 				char file_font[11];
 				sprintf((char*)&file_font, "font%d.nut", i);
-				_fr[i] = loadFont(file_font, directory, i != 0);
+				_fr[i] = loadFont(file_font, directory, false);
 			}
 		}
 	}