diff options
| author | Johannes Schickel | 2009-10-11 11:29:34 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2009-10-11 11:29:34 +0000 |
| commit | 8f6e9f0bf2cbd3c6cc59488aa7f8a4b5c92ffc15 (patch) | |
| tree | fd671ba67fbb3996ca5791945894b4c6b3111ab5 /engines/kyra/gui.cpp | |
| parent | 6492c00a3ad24c16ef77e837c478bbc1b4c1e1bb (diff) | |
| download | scummvm-rg350-8f6e9f0bf2cbd3c6cc59488aa7f8a4b5c92ffc15.tar.gz scummvm-rg350-8f6e9f0bf2cbd3c6cc59488aa7f8a4b5c92ffc15.tar.bz2 scummvm-rg350-8f6e9f0bf2cbd3c6cc59488aa7f8a4b5c92ffc15.zip | |
Fix FM-Towns/PC98 menu code.
svn-id: r44905
Diffstat (limited to 'engines/kyra/gui.cpp')
| -rw-r--r-- | engines/kyra/gui.cpp | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/engines/kyra/gui.cpp b/engines/kyra/gui.cpp index a38c6e40ee..0b84b82c72 100644 --- a/engines/kyra/gui.cpp +++ b/engines/kyra/gui.cpp @@ -143,19 +143,13 @@ void GUI::initMenu(Menu &menu) { else printMenuText(getMenuItemTitle(menu.item[i]), textX, textY, menu.item[i].textColor, 0, 8); } else { - Screen::FontId of = _screen->_currentFont; - if (_vm->_flags.gameID != GI_LOL && menu.item[i].saveSlot > 0) - _screen->setFont(Screen::FID_8_FNT); - if (_vm->gameFlags().platform != Common::kPlatformAmiga) - printMenuText(getMenuItemTitle(menu.item[i]), textX - 1, textY + 1, defaultColor1(), 0, 0, Screen::FID_8_FNT); + printMenuText(getMenuItemTitle(menu.item[i]), textX - 1, textY + 1, defaultColor1(), 0, 0); if (i == menu.highlightedItem) - printMenuText(getMenuItemTitle(menu.item[i]), textX, textY, menu.item[i].highlightColor, 0, 0, Screen::FID_8_FNT); + printMenuText(getMenuItemTitle(menu.item[i]), textX, textY, menu.item[i].highlightColor, 0, 0); else - printMenuText(getMenuItemTitle(menu.item[i]), textX, textY, menu.item[i].textColor, 0, 0, Screen::FID_8_FNT); - - _screen->setFont(of); + printMenuText(getMenuItemTitle(menu.item[i]), textX, textY, menu.item[i].textColor, 0, 0); } } } @@ -264,13 +258,9 @@ void GUI::redrawText(const Menu &menu) { textY++; printMenuText(getMenuItemTitle(menu.item[i]), textX, textY, menu.item[i].textColor, 0, 8); } else { - Screen::FontId of = _screen->_currentFont; - if (menu.item[i].saveSlot > 0) - _screen->setFont(Screen::FID_8_FNT); if (_vm->gameFlags().platform != Common::kPlatformAmiga) printMenuText(getMenuItemTitle(menu.item[i]), textX - 1, textY + 1, defaultColor1(), 0, 0); printMenuText(getMenuItemTitle(menu.item[i]), textX, textY, menu.item[i].textColor, 0, 0); - _screen->setFont(of); } } @@ -294,13 +284,9 @@ void GUI::redrawHighlight(const Menu &menu) { textY++; printMenuText(getMenuItemTitle(menu.item[i]), textX, textY, menu.item[i].highlightColor, 0, 8); } else { - Screen::FontId of = _screen->_currentFont; - if (menu.item[i].saveSlot > 0) - _screen->setFont(Screen::FID_8_FNT); if (_vm->gameFlags().platform != Common::kPlatformAmiga) printMenuText(getMenuItemTitle(menu.item[i]), textX - 1, textY + 1, defaultColor1(), 0, 0); printMenuText(getMenuItemTitle(menu.item[i]), textX, textY, menu.item[i].highlightColor, 0, 0); - _screen->setFont(of); } } @@ -461,7 +447,7 @@ void GUI::checkTextfieldInput() { } void GUI::printMenuText(const char *str, int x, int y, uint8 c0, uint8 c1, uint8 c2, Screen::FontId font) { - _text->printText(str, x, y, c0, c1, c2/*, font*/); + _text->printText(str, x, y, c0, c1, c2); } int GUI::getMenuCenterStringX(const char *str, int x1, int x2) { |