[Scummvm-cvs-logs] SF.net SVN: scummvm:[42820] scummvm/trunk/engines/kyra/screen.cpp

[lordhoto at users.sourceforge.net]

Revision: 42820
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42820&view=rev
Author:   lordhoto
Date:     2009-07-26 14:18:49 +0000 (Sun, 26 Jul 2009)

Log Message:
-----------
Simplify KYRA's SJIS font loading code.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/screen.cpp

Modified: scummvm/trunk/engines/kyra/screen.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen.cpp	2009-07-26 14:18:34 UTC (rev 42819)
+++ scummvm/trunk/engines/kyra/screen.cpp	2009-07-26 14:18:49 UTC (rev 42820)
@@ -95,25 +95,8 @@
 		}
 
 		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;
-				}
-			}
+			_sjisFont = Graphics::FontSJIS::createFont(_vm->gameFlags().platform);
 
-			// 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;
-				}
-			}
-
 			if (!_sjisFont)
 				error("Could not load any SJIS font, neither the original nor ScummVM's 'SJIS.FNT'");
 			_sjisFont->enableOutline(!_use16ColorMode);


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