[Scummvm-cvs-logs] CVS: scummvm/kyra kyra.cpp,1.44,1.45

[Gregory Montoir]

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

Modified Files:
	kyra.cpp 
Log Message:
only load the 6.fnt file for floppy version (which is unused in the introduction)

Index: kyra.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/kyra.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- kyra.cpp	10 Sep 2005 07:46:18 -0000	1.44
+++ kyra.cpp	10 Sep 2005 20:03:53 -0000	1.45
@@ -189,7 +189,7 @@
 	_quitFlag = false;
 	uint32 sz;
 
-	if (_game != KYRA1DEMO) {
+	if (_game == KYRA1) {
 		_screen->loadFont(Screen::FID_6_FNT, _res->fileData("6.FNT", &sz));
 	}
 	_screen->loadFont(Screen::FID_8_FNT, _res->fileData("8FAT.FNT", &sz));
@@ -210,7 +210,7 @@
 	debug(9, "KyraEngine::startup()");
 	static const uint8 colorMap[] = { 0, 0, 0, 0, 12, 12, 12, 0, 0, 0, 0, 0 };
 	_screen->setTextColorMap(colorMap);
-	_screen->setFont(Screen::FID_6_FNT);
+//	_screen->setFont(Screen::FID_6_FNT);
 	_screen->setAnimBlockPtr(3750);
 	memset(_flagsTable, 0, sizeof(_flagsTable));
 	// XXX