[Scummvm-cvs-logs] CVS: scummvm/scumm charset.cpp,2.10,2.11 charset.h,2.6,2.7

Pawel Kolodziejski aquadran at users.sourceforge.net
Tue Dec 31 13:42:02 CET 2002


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

Modified Files:
	charset.cpp charset.h 
Log Message:
there are 5 fonts in CMI

Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.cpp,v
retrieving revision 2.10
retrieving revision 2.11
diff -u -d -r2.10 -r2.11
--- charset.cpp	31 Dec 2002 20:52:11 -0000	2.10
+++ charset.cpp	31 Dec 2002 21:41:24 -0000	2.11
@@ -395,7 +395,7 @@
 {
 	_current = 0;
 	
-	for (int i = 0; i < 4; i++) {
+	for (int i = 0; i < 5; i++) {
 		char fontname[256];
 		sprintf(fontname, "font%d.nut", i);
 		_fr[i] = new NutRenderer(_vm);
@@ -408,13 +408,13 @@
 
 CharsetRendererNut::~CharsetRendererNut()
 {
-	for (int i = 0; i < 4; i++)
+	for (int i = 0; i < 5; i++)
 		delete _fr[i];
 }
 
 void CharsetRendererNut::setCurID(byte id)
 {
-	assert(id < 4);
+	assert(id < 5);
 	_curId = id;
 	_current = _fr[id];
 }

Index: charset.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.h,v
retrieving revision 2.6
retrieving revision 2.7
diff -u -d -r2.6 -r2.7
--- charset.h	26 Dec 2002 01:47:40 -0000	2.6
+++ charset.h	31 Dec 2002 21:41:24 -0000	2.7
@@ -108,7 +108,7 @@
 protected:
 	int getCharWidth(byte chr);
 
-	NutRenderer *_fr[4];
+	NutRenderer *_fr[5];
 	NutRenderer *_current;
 
 public:





More information about the Scummvm-git-logs mailing list