[Scummvm-cvs-logs] scummvm master -> 47b90ef3cde832b6314bbcc0321cb074408d944e

[bluegr]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
45280d035a ZVISION: Fix font error message condition
47b90ef3cd ZVISION: Search fonts in game directory (e.g. in game/FONTS/)


Commit: 45280d035afe29dc1f8971eac713ea1fdb64bfb5
    https://github.com/scummvm/scummvm/commit/45280d035afe29dc1f8971eac713ea1fdb64bfb5
Author: Marisa-Chan (thunder_8888 at mail.ru)
Date: 2014-12-30T01:32:43+02:00

Commit Message:
ZVISION: Fix font error message condition

Changed paths:
    engines/zvision/zvision.cpp



diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 88cc1e2..10e0aae 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -255,7 +255,7 @@ Common::Error ZVision::run() {
 		_saveManager->loadGame(ConfMan.getInt("save_slot"));
 
 	// Before starting, make absolutely sure that the user has copied the needed fonts
-	if (!Common::File::exists("arial.ttf") && !Common::File::exists("FreeSans.ttf")) {
+	if (!Common::File::exists("arial.ttf") && !Common::File::exists("FreeSans.ttf") && !_searchManager->hasFile("arial.ttf")  && !_searchManager->hasFile("FreeSans.ttf") ) {
 		GUI::MessageDialog dialog(
 				"Before playing this game, you'll need to copy the required "
 				"fonts into ScummVM's extras directory, or into the game directory. "


Commit: 47b90ef3cde832b6314bbcc0321cb074408d944e
    https://github.com/scummvm/scummvm/commit/47b90ef3cde832b6314bbcc0321cb074408d944e
Author: Marisa-Chan (thunder_8888 at mail.ru)
Date: 2014-12-30T01:33:47+02:00

Commit Message:
ZVISION: Search fonts in game directory (e.g. in game/FONTS/)

Changed paths:
    engines/zvision/text/truetype_font.cpp



diff --git a/engines/zvision/text/truetype_font.cpp b/engines/zvision/text/truetype_font.cpp
index f64c0ab..85d9fa5 100644
--- a/engines/zvision/text/truetype_font.cpp
+++ b/engines/zvision/text/truetype_font.cpp
@@ -108,7 +108,7 @@ bool StyledTTFont::loadFont(const Common::String &fontName, int32 point) {
 	bool sharp = (_style & STTF_SHARP) == STTF_SHARP;
 
 	Common::File file;
-	if (!file.open(newFontName) && !file.open(freeFontName))
+	if (!file.open(newFontName) && !file.open(freeFontName) && !_engine->getSearchManager()->openFile(file, newFontName) && !_engine->getSearchManager()->openFile(file, freeFontName))
 		error("Unable to open font file %s (free alternative: %s)", newFontName.c_str(), freeFontName.c_str());
 
 	Graphics::Font *_newFont = Graphics::loadTTFFont(file, point, 60, (sharp ? Graphics::kTTFRenderModeMonochrome : Graphics::kTTFRenderModeNormal)); // 66 dpi for 640 x 480 on 14" display