[Scummvm-cvs-logs] scummvm master -> 953c26cbf6601ce9191f1d45f2f0205e836efe29

[m-kiewitz]

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

Summary:
953c26cbf6 AGI: Disable font loading from HGC_GRAF.OVL (AGI3)


Commit: 953c26cbf6601ce9191f1d45f2f0205e836efe29
    https://github.com/scummvm/scummvm/commit/953c26cbf6601ce9191f1d45f2f0205e836efe29
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2016-02-28T11:56:48+01:00

Commit Message:
AGI: Disable font loading from HGC_GRAF.OVL (AGI3)

It seems Sierra basically put a low res font in there, so
it's useless. We should rather directly use the PC BIOS font
in those cases. The code could be useful at some point in case
we add support for the AGI3 Hercules rendering, although I think
it looks worse, because graphics are basically "compressed".

Changed paths:
    engines/agi/font.cpp



diff --git a/engines/agi/font.cpp b/engines/agi/font.cpp
index 5e6ba1e..0171678 100644
--- a/engines/agi/font.cpp
+++ b/engines/agi/font.cpp
@@ -1239,6 +1239,10 @@ void GfxFont::loadFontHercules() {
 
 	}
 
+	// It seems hgc_graf.ovl holds a low-res font. It makes no real sense to use it.
+	// This was only done to AGI3 games and those rendered differently (2 pixel lines -> 3 pixel lines instead of 4)
+	// User could copy hgc_font from another AGI game over to get the hires font working.
+#if 0
 	if (!_fontDataAllocated) {
 		if (fontFile.open("hgc_graf.ovl")) {
 			// hgc_graf.ovl file found, this is font data + code. non-interleaved font data, should be 3075 bytes
@@ -1273,6 +1277,7 @@ void GfxFont::loadFontHercules() {
 			fontFile.close();
 		}
 	}
+#endif
 
 	if (_fontDataAllocated) {
 		// font loaded
@@ -1283,7 +1288,7 @@ void GfxFont::loadFontHercules() {
 
 	} else {
 		// Continue, if no file was not found
-		warning("Could not open/use file 'hgc_font' or 'hgc_graf.ovl' for Hercules hires font");
+		warning("Could not open/use file 'hgc_font' for Hercules hires font");
 	}
 }