[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_font.cpp,1.26,1.27 smush_font.h,1.13,1.14 smush_player.cpp,1.156,1.157

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18061/smush

Modified Files:
	smush_font.cpp smush_font.h smush_player.cpp 
Log Message:
cleanup

Index: smush_font.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_font.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- smush_font.cpp	10 Apr 2005 12:59:17 -0000	1.26
+++ smush_font.cpp	20 Apr 2005 19:59:18 -0000	1.27
@@ -28,8 +28,8 @@
 
 namespace Scumm {
 
-SmushFont::SmushFont(bool use_original_colors, bool new_colors) :
-	NutRenderer(g_scumm),	// FIXME: evil hack
+SmushFont::SmushFont(ScummEngine *vm, bool use_original_colors, bool new_colors) :
+	NutRenderer(vm),
 	_color(-1),
 	_new_colors(new_colors),
 	_original(use_original_colors) {
@@ -44,8 +44,8 @@
 
 	int width = 0;
 	while (*str) {
-		if(*str & 0x80 && g_scumm->_useCJKMode) {
-			width += g_scumm->_2byteWidth + 1;
+		if(*str & 0x80 && _vm->_useCJKMode) {
+			width += _vm->_2byteWidth + 1;
 			str += 2;
 		} else
 			width += getCharWidth(*str++);
@@ -131,7 +131,7 @@
 	if (_new_colors)
 		color = (char)0xff;
 
-	if (g_scumm->_gameId == GID_FT)
+	if (_vm->_gameId == GID_FT)
 		color = 1;
 
 	for (int j = 0; j < h; j++) {

Index: smush_font.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_font.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- smush_font.h	1 Jan 2005 16:09:19 -0000	1.13
+++ smush_font.h	20 Apr 2005 19:59:18 -0000	1.14
@@ -41,7 +41,7 @@
 	void drawSubstring(const char *str, byte *buffer, int dst_width, int x, int y);
 
 public:
-	SmushFont(bool use_original_colors, bool new_colors);
+	SmushFont(ScummEngine *vm, bool use_original_colors, bool new_colors);
 
 	void setColor(byte c) { _color = c; }
 	void drawString    (const char *str, byte *buffer, int dst_width, int dst_height, int x, int y, bool center);

Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -d -r1.156 -r1.157
--- smush_player.cpp	20 Apr 2005 18:21:30 -0000	1.156
+++ smush_player.cpp	20 Apr 2005 19:59:18 -0000	1.157
@@ -991,10 +991,10 @@
 
 	if (_vm->_gameId == GID_FT) {
 		if (!((_vm->_features & GF_DEMO) && (_vm->_platform == Common::kPlatformPC))) {
-			_sf[0] = new SmushFont(true, false);
-			_sf[1] = new SmushFont(true, false);
-			_sf[2] = new SmushFont(true, false);
-			_sf[3] = new SmushFont(true, false);
+			_sf[0] = new SmushFont(_vm, true, false);
+			_sf[1] = new SmushFont(_vm, true, false);
+			_sf[2] = new SmushFont(_vm, true, false);
+			_sf[3] = new SmushFont(_vm, true, false);
 			_sf[0]->loadFont("scummfnt.nut");
 			_sf[1]->loadFont("techfnt.nut");
 			_sf[2]->loadFont("titlfnt.nut");
@@ -1004,7 +1004,7 @@
 		if (!(_vm->_features & GF_DEMO)) {
 			for (i = 0; i < 4; i++) {
 				sprintf(file_font, "font%d.nut", i);
-				_sf[i] = new SmushFont(i != 0, false);
+				_sf[i] = new SmushFont(_vm, i != 0, false);
 				_sf[i]->loadFont(file_font);
 			}
 		}
@@ -1013,7 +1013,7 @@
 			if ((_vm->_features & GF_DEMO) && (i == 4))
 				break;
 			sprintf(file_font, "font%d.nut", i);
-			_sf[i] = new SmushFont(false, true);
+			_sf[i] = new SmushFont(_vm, false, true);
 			_sf[i]->loadFont(file_font);
 		}
 	} else {