[Scummvm-cvs-logs] SF.net SVN: scummvm: [28617] scummvm/trunk/engines/scumm/charset.cpp

[Kirben at users.sourceforge.net]

Revision: 28617
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28617&view=rev
Author:   Kirben
Date:     2007-08-14 06:42:05 -0700 (Tue, 14 Aug 2007)

Log Message:
-----------
Limit loading external fonts, to required game versions.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/charset.cpp

Modified: scummvm/trunk/engines/scumm/charset.cpp
===================================================================
--- scummvm/trunk/engines/scumm/charset.cpp	2007-08-14 13:36:03 UTC (rev 28616)
+++ scummvm/trunk/engines/scumm/charset.cpp	2007-08-14 13:42:05 UTC (rev 28617)
@@ -50,10 +50,7 @@
 	_useCJKMode = false;
 	_textSurfaceMultiplier = 1;
 
-	if (_game.platform == Common::kPlatformSegaCD)
-		return;
-
-	if (_language == Common::JA_JPN && _game.version <= 5) { // FM-TOWNS v3 / v5 Kanji
+	if (_game.version <= 5 && _game.platform == Common::kPlatformFMTowns && _language == Common::JA_JPN) { // FM-TOWNS v3 / v5 Kanji
 		int numChar = 256 * 32;
 		_2byteWidth = 16;
 		_2byteHeight = 16;
@@ -66,7 +63,7 @@
 			fp.close();
 		}
 		_textSurfaceMultiplier = 2;
-	} else if (_language == Common::KO_KOR || _language == Common::JA_JPN || _language == Common::ZH_TWN) {
+	} else if (_game.version >= 7 && _language == Common::KO_KOR || _language == Common::JA_JPN || _language == Common::ZH_TWN) {
 		int numChar = 0;
 		const char *fontFile = NULL;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.