diff options
| author | athrxx | 2019-12-18 22:29:49 +0100 |
|---|---|---|
| committer | athrxx | 2019-12-18 22:29:49 +0100 |
| commit | 4b7a48fb75d26ac1be3e31a1b174b247f9732839 (patch) | |
| tree | 6da452feb5a68d7c56a29d2ee62e9ff23f19779f | |
| parent | d98b5fe8240125715ccf5fba62183ea5e8550db1 (diff) | |
| download | scummvm-rg350-4b7a48fb75d26ac1be3e31a1b174b247f9732839.tar.gz scummvm-rg350-4b7a48fb75d26ac1be3e31a1b174b247f9732839.tar.bz2 scummvm-rg350-4b7a48fb75d26ac1be3e31a1b174b247f9732839.zip | |
KYRA: fix broken builds (now for real?)
| -rw-r--r-- | engines/kyra/graphics/screen.cpp | 6 | ||||
| -rw-r--r-- | engines/kyra/graphics/screen_eob.cpp | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/engines/kyra/graphics/screen.cpp b/engines/kyra/graphics/screen.cpp index d1ed281061..148f2d8f37 100644 --- a/engines/kyra/graphics/screen.cpp +++ b/engines/kyra/graphics/screen.cpp @@ -178,12 +178,6 @@ bool Screen::init() { _fonts[FID_SJIS_TEXTMODE_FNT] = new SJISFont(_sjisFontShared, _sjisInvisibleColor, true, false, 0); else _fonts[FID_SJIS_FNT] = new SJISFont(_sjisFontShared, _sjisInvisibleColor, false, _vm->game() != GI_LOL && _vm->game() != GI_EOB2, _vm->game() == GI_LOL ? 1 : 0); - - if (_vm->game() == GI_EOB2 && _vm->gameFlags().platform == Common::kPlatformFMTowns) { - assert(_fonts[FID_SJIS_FNT]); - _fonts[FID_SJIS_FNT]->setStyle(Font::kFSFat); - _fonts[FID_SJIS_LARGE_FNT] = new SJISFontLarge(_sjisFontShared); - } } } diff --git a/engines/kyra/graphics/screen_eob.cpp b/engines/kyra/graphics/screen_eob.cpp index 3ba1ca35d7..1e3fb383a8 100644 --- a/engines/kyra/graphics/screen_eob.cpp +++ b/engines/kyra/graphics/screen_eob.cpp @@ -93,6 +93,9 @@ bool Screen_EoB::init() { _convertHiColorBuffer = new uint8[SCREEN_H * SCREEN_W]; enableHiColorMode(true); loadFont(FID_SJIS_SMALL_FNT, "FONT.DMP"); + assert(_fonts[FID_SJIS_FNT]); + _fonts[FID_SJIS_FNT]->setStyle(Font::kFSFat); + _fonts[FID_SJIS_LARGE_FNT] = new SJISFontLarge(_sjisFontShared); } else if (_vm->game() == GI_EOB1 && _vm->gameFlags().platform == Common::kPlatformPC98) { loadFont(FID_SJIS_SMALL_FNT, "FONT12.FNT"); _fonts[FID_SJIS_FNT] = new SJISFontEoB1PC98(_sjisFontShared, 12, _vm->staticres()->loadRawDataBe16(kEoB1Ascii2SjisTable1, temp), _vm->staticres()->loadRawDataBe16(kEoB1Ascii2SjisTable2, temp)); |