[Scummvm-cvs-logs] CVS: scummvm/scumm nut_renderer.cpp,1.64,1.65

[Gregory Montoir]

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

Modified Files:
	nut_renderer.cpp 
Log Message:
constness

Index: nut_renderer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/nut_renderer.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- nut_renderer.cpp	14 Aug 2005 02:04:26 -0000	1.64
+++ nut_renderer.cpp	19 Aug 2005 22:36:08 -0000	1.65
@@ -75,7 +75,7 @@
 
 	ScummFile file;
 	_vm->openFile(file, filename);
-	if (file.isOpen() == false) {
+	if (!file.isOpen()) {
 		error("NutRenderer::loadFont() Can't open font file: %s", filename);
 		return false;
 	}
@@ -184,9 +184,9 @@
 	// the question remains whether they did it this way, too, or if there is
 	// some "font shadow" resource we don't know yet.
 
-	int offsetX[7] = { -1,  0, 1, 0, 1, 2, 0 };
-	int offsetY[7] = {  0, -1, 0, 1, 2, 1, 0 };
-	int cTable[7] =  {  0,  0, 0, 0, 0, 0, color };
+	static const int offsetX[7] = { -1,  0, 1, 0, 1, 2, 0 };
+	static const int offsetY[7] = {  0, -1, 0, 1, 2, 1, 0 };
+	const int cTable[7] = { 0, 0, 0, 0, 0, 0, color };
 	int i = 0;
 
 	if (!showShadow)
@@ -278,7 +278,7 @@
 	byte *dst = (byte *)s.pixels + y * s.pitch + x;
 	const int width = _vm->_2byteWidth;
 	const int height = MIN(_vm->_2byteHeight, s.h - y);
-	byte *src = _vm->get2byteCharPtr(c);
+	const byte *src = _vm->get2byteCharPtr(c);
 	byte bits = 0;
 
 	if (height <= 0 || width <= 0) {