[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.252,1.253 scummvm.cpp,2.233,2.234

[Max Horn]

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

Modified Files:
	scumm.h scummvm.cpp 
Log Message:
cleanup

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -d -r1.252 -r1.253
--- scumm.h	12 Jun 2003 16:38:41 -0000	1.252
+++ scumm.h	14 Jun 2003 11:52:34 -0000	1.253
@@ -1072,10 +1072,11 @@
 	int _2byteHeight;
 	int _2byteWidth;
 	byte *get2byteCharPtr(int idx);
-	
-	
+
 protected:
+	byte *_2byteFontPtr;
 
+	
 #if defined(SCUMM_LITTLE_ENDIAN)
 	uint32 fileReadDword() { return _fileHandle.readUint32LE(); }
 #elif defined(SCUMM_BIG_ENDIAN)

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.233
retrieving revision 2.234
diff -u -d -r2.233 -r2.234
--- scummvm.cpp	13 Jun 2003 09:11:31 -0000	2.233
+++ scummvm.cpp	14 Jun 2003 11:52:34 -0000	2.234
@@ -60,11 +60,6 @@
 Scumm *g_scumm = 0;
 ScummDebugger *g_debugger;
 
-byte *_2byteFontPtr;
-int _2byteWidth;
-int _2byteHeight;
-bool _CJKMode;
-
 byte *Scumm::get2byteCharPtr(int idx) {
 	/*
 		switch(language)