[Scummvm-cvs-logs] CVS: scummvm/scumm/smush frenderer.cpp,1.13,1.14 player.cpp,1.34,1.35

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1:/tmp/cvs-serv10829

Modified Files:
	frenderer.cpp player.cpp 
Log Message:
fixed comi smush subtitles colors

Index: frenderer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/frenderer.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- frenderer.cpp	19 Jan 2003 09:03:07 -0000	1.13
+++ frenderer.cpp	19 Jan 2003 19:40:37 -0000	1.14
@@ -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 @@
 		}
 	} 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;

Index: player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/player.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- player.cpp	19 Jan 2003 11:11:07 -0000	1.34
+++ player.cpp	19 Jan 2003 19:40:40 -0000	1.35
@@ -843,7 +843,7 @@
 			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);
 			}
 		}
 	}