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

[fingolfin at users.sourceforge.net]

Revision: 44346
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44346&view=rev
Author:   fingolfin
Date:     2009-09-25 11:39:22 +0000 (Fri, 25 Sep 2009)

Log Message:
-----------
Patch #2858137 and fix for bug #2855359: fmt_fnt.rom font loading failure is ignored

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

Modified: scummvm/trunk/engines/scumm/charset.cpp
===================================================================
--- scummvm/trunk/engines/scumm/charset.cpp	2009-09-25 11:27:41 UTC (rev 44345)
+++ scummvm/trunk/engines/scumm/charset.cpp	2009-09-25 11:39:22 UTC (rev 44346)
@@ -56,7 +56,9 @@
 		_2byteWidth = 16;
 		_2byteHeight = 16;
 		// use FM-TOWNS font rom, since game files don't have kanji font resources
-		if (fp.open("fmt_fnt.rom")) {
+		if (!fp.open("fmt_fnt.rom")) {
+			error("SCUMM::Font: Couldn't open fmt_fnt.rom");
+		} else {
 			_useCJKMode = true;
 			debug(2, "Loading FM-TOWNS Kanji rom");
 			_2byteFontPtr = new byte[((_2byteWidth + 7) / 8) * _2byteHeight * numChar];
@@ -116,7 +118,10 @@
 			fp.read(_2byteFontPtr, ((_2byteWidth + 7) / 8) * _2byteHeight * numChar);
 			fp.close();
 		} else {
-			error("Couldn't load any font");
+			if (fontFile)
+				error("SCUMM::Font: Couldn't open %s",fontFile);
+			else
+				error("SCUMM::Font: Couldn't load any font");
 		}
 	}
 }


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