diff options
author | David Corrales | 2007-08-05 19:34:20 +0000 |
---|---|---|
committer | David Corrales | 2007-08-05 19:34:20 +0000 |
commit | 6856535010bd2fa4449bcfde1c88dc06cd46e26f (patch) | |
tree | b81a2234c2beff0312c93e039d6cafda4babeca6 /engines/saga/font.cpp | |
parent | 1400d28bfb37fc94f3c44dec0a4d0cef65fb8fb7 (diff) | |
parent | ec1803f838d5efc7decf75c05a1fb4a9633751e5 (diff) | |
download | scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.tar.gz scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.tar.bz2 scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.zip |
Merged fsnode with trunk: r27971:28460
svn-id: r28462
Diffstat (limited to 'engines/saga/font.cpp')
-rw-r--r-- | engines/saga/font.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/engines/saga/font.cpp b/engines/saga/font.cpp index ece48512df..71cd6b0eef 100644 --- a/engines/saga/font.cpp +++ b/engines/saga/font.cpp @@ -24,6 +24,7 @@ */ // Font management and font drawing module + #include "saga/saga.h" #include "saga/gfx.h" #include "saga/rscfile.h" @@ -331,7 +332,7 @@ void Font::outFont(const FontStyle &drawFont, Surface *ds, const char *text, siz // Check if character is defined if ((drawFont.fontCharEntry[c_code].index == 0) && (c_code != FONT_FIRSTCHAR)) { #if FONT_SHOWUNDEFINED - if (c_code == FONT_CH_SPACE) { + if (c_code == FONT_CH_SPACE || c_code == 9) { textPoint.x += drawFont.fontCharEntry[c_code].tracking; continue; } @@ -629,7 +630,8 @@ void Font::textDrawRect(FontId fontId, Surface *ds, const char *text, const Comm Font::FontId Font::knownFont2FontIdx(KnownFont font) { FontId fontId = kSmallFont; - if (_vm->getGameType() == GType_ITE) { + // The demo version of IHNM has 3 font types (like ITE), not 6 (like the full version of IHNM) + if (_vm->getGameType() == GType_ITE || _vm->getGameId() == GID_IHNM_DEMO) { switch (font) { case (kKnownFontSmall): @@ -652,7 +654,7 @@ Font::FontId Font::knownFont2FontIdx(KnownFont font) { fontId = _vm->_font->valid(kBigFont) ? kBigFont : kMediumFont; break; } - } else if (_vm->getGameType() == GType_IHNM) { + } else if (_vm->getGameType() == GType_IHNM && _vm->getGameId() != GID_IHNM_DEMO) { switch (font) { case (kKnownFontSmall): |