diff options
| author | Paul Gilbert | 2019-01-27 17:04:29 -0800 |
|---|---|---|
| committer | Paul Gilbert | 2019-01-29 21:17:18 -0800 |
| commit | 53a1426cc398568f8e707e132ad0d7f1a7782c0f (patch) | |
| tree | e9ab2eb0e96864389647b4c9f88cda4104ca062a /engines/glk/screen.cpp | |
| parent | 52f9451bbb216999c0c1d61521b2cb4117781a0b (diff) | |
| download | scummvm-rg350-53a1426cc398568f8e707e132ad0d7f1a7782c0f.tar.gz scummvm-rg350-53a1426cc398568f8e707e132ad0d7f1a7782c0f.tar.bz2 scummvm-rg350-53a1426cc398568f8e707e132ad0d7f1a7782c0f.zip | |
GLK: FROTZ: Add 6x8 font for Infocom v6 games
Diffstat (limited to 'engines/glk/screen.cpp')
| -rw-r--r-- | engines/glk/screen.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/glk/screen.cpp b/engines/glk/screen.cpp index a4fcc63704..8322e9c246 100644 --- a/engines/glk/screen.cpp +++ b/engines/glk/screen.cpp @@ -50,11 +50,11 @@ void Screen::initialize() { Common::Rect r1 = f->getBoundingBox('o'); Common::Rect r2 = f->getBoundingBox('y'); double baseLine = (double)r1.bottom; - double leading = (double)((idx == 0) ? r2.bottom : r2.bottom + 2); + double leading = (double)((idx == 0) ? r2.bottom : r2.bottom + g_conf->_propInfo._lineSeparation); i->_leading = static_cast<int>(MAX((double)i->_leading, leading)); i->_baseLine = static_cast<int>(MAX((double)i->_baseLine, baseLine)); - i->_cellW = _fonts[0]->getStringWidth("0"); + i->_cellW = _fonts[0]->getMaxCharWidth(); i->_cellH = i->_leading; } } @@ -87,7 +87,8 @@ bool Screen::loadFonts() { f.read(buffer, 3); buffer[3] = '\0'; - if (Common::String(buffer) != "1.1") { + double version = atof(buffer); + if (version < 1.2) { delete archive; return false; } |