diff options
| author | athrxx | 2019-02-05 23:04:17 +0100 |
|---|---|---|
| committer | athrxx | 2019-03-06 20:48:21 +0100 |
| commit | 490e41cfad44505a4f742db9092d9a960783da6c (patch) | |
| tree | 7d8e0d51c10a8213d364e9ca5898d07958878c8e /engines/kyra/graphics/screen.cpp | |
| parent | 7b8c84fa4d3f3d8e1c5fa543fae7ddbd7a495bb7 (diff) | |
| download | scummvm-rg350-490e41cfad44505a4f742db9092d9a960783da6c.tar.gz scummvm-rg350-490e41cfad44505a4f742db9092d9a960783da6c.tar.bz2 scummvm-rg350-490e41cfad44505a4f742db9092d9a960783da6c.zip | |
KYRA: (EOB1/Amiga) - implement AmigaDOS font support
- only basic support - no kerning, spacing, etc., since EOB doesn't need that
- also improve palette loading
Diffstat (limited to 'engines/kyra/graphics/screen.cpp')
| -rw-r--r-- | engines/kyra/graphics/screen.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/kyra/graphics/screen.cpp b/engines/kyra/graphics/screen.cpp index 6af970eee5..2a5e51162e 100644 --- a/engines/kyra/graphics/screen.cpp +++ b/engines/kyra/graphics/screen.cpp @@ -1361,9 +1361,11 @@ bool Screen::loadFont(FontId fontId, const char *filename) { Font *&fnt = _fonts[fontId]; if (!fnt) { - if (_isAmiga) + if (_vm->game() == GI_KYRA1 && _isAmiga) fnt = new AMIGAFont(); #ifdef ENABLE_EOB + else if (_isAmiga) + fnt = new AmigaDOSFont(_vm->resource()); else if (_vm->game() == GI_EOB1 || _vm->game() == GI_EOB2) // We use normal VGA rendering in EOB II, since we do the complete EGA dithering in updateScreen(). fnt = new OldDOSFont(_useHiResEGADithering ? Common::kRenderVGA : _renderMode); @@ -3725,7 +3727,7 @@ int AMIGAFont::getCharWidth(uint16 c) const { } void AMIGAFont::drawChar(uint16 c, byte *dst, int pitch, int) const { - //if (c >= 255) + if (c >= 255) return; if (_chars[c].yOffset == 255) |