aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2007-08-14 13:42:05 +0000
committerTravis Howell2007-08-14 13:42:05 +0000
commitc9031ebb7ff14b862544bd62b99f6638625174bf (patch)
treee42400b49f9a609390fdf9ec7a57c214da8a7423
parente888aa1217acc8da8b49ef44da4d71dd1df71e27 (diff)
downloadscummvm-rg350-c9031ebb7ff14b862544bd62b99f6638625174bf.tar.gz
scummvm-rg350-c9031ebb7ff14b862544bd62b99f6638625174bf.tar.bz2
scummvm-rg350-c9031ebb7ff14b862544bd62b99f6638625174bf.zip
Limit loading external fonts, to required game versions.
svn-id: r28617
-rw-r--r--engines/scumm/charset.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/engines/scumm/charset.cpp b/engines/scumm/charset.cpp
index 2271bf53a1..35b829d983 100644
--- a/engines/scumm/charset.cpp
+++ b/engines/scumm/charset.cpp
@@ -50,10 +50,7 @@ void ScummEngine::loadCJKFont() {
_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 @@ void ScummEngine::loadCJKFont() {
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;