[Scummvm-cvs-logs] CVS: scummvm/scumm nut_renderer.cpp,1.28,1.29 nut_renderer.h,1.10,1.11

[Max Horn]

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

Modified Files:
	nut_renderer.cpp nut_renderer.h 
Log Message:
make SmushFont inherit from NutRenderer (TODO: drawChar stuff should be unified, too)

Index: nut_renderer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/nut_renderer.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- nut_renderer.cpp	4 Jun 2003 23:51:25 -0000	1.28
+++ nut_renderer.cpp	7 Jun 2003 00:33:46 -0000	1.29
@@ -23,11 +23,11 @@
 #include "nut_renderer.h"
 
 
-NutRenderer::NutRenderer(Scumm *vm) {
-	_vm = vm;
-	_initialized = false;
-	_loaded = false;
-	_nbChars = 0;
+NutRenderer::NutRenderer(Scumm *vm) :
+	_vm(vm),
+	_initialized(false),
+	_loaded(false),
+	_nbChars(0) {
 	
 	for(int i = 0; i < 256; i++)
 		_chars[i].src = NULL;
@@ -134,10 +134,10 @@
 		return 0;
 	}
 
-	if(c >= 0x80 && g_scumm->_CJKMode) {
-		if(g_scumm->_gameId == GID_CMI)
+	if(c >= 0x80 && _vm->_CJKMode) {
+		if(_vm->_gameId == GID_CMI)
 			return 8;
-		if(g_scumm->_gameId == GID_DIG)
+		if(_vm->_gameId == GID_DIG)
 			return 6;
 		return 0;
 	}
@@ -155,10 +155,10 @@
 		return 0;
 	}
 
-	if(c >= 0x80 && g_scumm->_CJKMode) {
-		if(g_scumm->_gameId == GID_CMI)
+	if(c >= 0x80 && _vm->_CJKMode) {
+		if(_vm->_gameId == GID_CMI)
 			return 16;
-		if(g_scumm->_gameId == GID_DIG)
+		if(_vm->_gameId == GID_DIG)
 			return 10;
 		return 0;
 	}
@@ -169,21 +169,6 @@
 	return _chars[c].height;
 }
 
-int NutRenderer::getStringWidth(const byte *str) {
-	debug(8, "NutRenderer::getStringWidth() called");
-	if (!_loaded) {
-		warning("NutRenderer::getStringWidth() Font is not loaded");
-		return 0;
-	}
-	int width = 0;
-
-	while (*str) {
-		width += getCharWidth(*str++);
-	}
-
-	return width;
-}
-
 void NutRenderer::drawShadowChar(int c, int x, int y, byte color, bool useMask) {
 	debug(8, "NutRenderer::drawChar('%c', %d, %d, %d, %d) called", c, x, y, (int)color, useMask);
 	if (!_loaded) {
@@ -263,9 +248,9 @@
 		return;
 	}
 
-	int width = g_scumm->_2byteWidth;
-	int height = g_scumm->_2byteHeight;
-	byte *src = g_scumm->get2byteCharPtr(c);
+	int width = _vm->_2byteWidth;
+	int height = _vm->_2byteHeight;
+	byte *src = _vm->get2byteCharPtr(c);
 	byte bits = 0;
 
 	byte maskmask;

Index: nut_renderer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/nut_renderer.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- nut_renderer.h	4 Jun 2003 23:51:25 -0000	1.10
+++ nut_renderer.h	7 Jun 2003 00:33:46 -0000	1.11
@@ -39,12 +39,12 @@
 
 	void decodeCodec44(byte *dst, const byte *src, uint32 length);
 
-	void draw2byte(byte *dst, byte *mask, int c, int x, int y, byte color);
-	void drawChar(byte *dst, byte *mask, byte c, int x, int y, byte color);
+	virtual void draw2byte(byte *dst, byte *mask, int c, int x, int y, byte color);
+	virtual void drawChar(byte *dst, byte *mask, byte c, int x, int y, byte color);
 
 public:
 	NutRenderer(Scumm *vm);
-	~NutRenderer();
+	virtual ~NutRenderer();
 
 	bool loadFont(const char *filename, const char *dir);
 
@@ -52,7 +52,6 @@
 
 	int getCharWidth(byte c);
 	int getCharHeight(byte c);
-	int getStringWidth(const byte *string);
 };