aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2009-07-26 14:18:49 +0000
committerJohannes Schickel2009-07-26 14:18:49 +0000
commit84c0bf22d2efd12f8d6391c08da05485487a219e (patch)
treee934fb5e235676285d9d694d0a2aba47bf8b6315
parentec67b583b05ace5a0e70449cf335deeba6df5e14 (diff)
downloadscummvm-rg350-84c0bf22d2efd12f8d6391c08da05485487a219e.tar.gz
scummvm-rg350-84c0bf22d2efd12f8d6391c08da05485487a219e.tar.bz2
scummvm-rg350-84c0bf22d2efd12f8d6391c08da05485487a219e.zip
Simplify KYRA's SJIS font loading code.
svn-id: r42820
-rw-r--r--engines/kyra/screen.cpp19
1 files changed, 1 insertions, 18 deletions
diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index 53df4bbbd9..7a7544a589 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -95,24 +95,7 @@ bool Screen::init() {
}
if (_useSJIS) {
- // First of all try to load the original ROM
- if (_vm->gameFlags().platform == Common::kPlatformFMTowns) {
- _sjisFont = new Graphics::FontTowns();
- if (_sjisFont && !_sjisFont->loadData()) {
- delete _sjisFont;
- _sjisFont = 0;
- }
- }
-
- // If we were not able to load any system ROM, we'll try the
- // ScummVM SJIS font.
- if (!_sjisFont) {
- _sjisFont = new Graphics::FontSjisSVM();
- if (_sjisFont && !_sjisFont->loadData()) {
- delete _sjisFont;
- _sjisFont = 0;
- }
- }
+ _sjisFont = Graphics::FontSJIS::createFont(_vm->gameFlags().platform);
if (!_sjisFont)
error("Could not load any SJIS font, neither the original nor ScummVM's 'SJIS.FNT'");