aboutsummaryrefslogtreecommitdiff
path: root/engines/sky/control.cpp
diff options
context:
space:
mode:
authorTorbjörn Andersson2007-03-22 18:49:42 +0000
committerTorbjörn Andersson2007-03-22 18:49:42 +0000
commit86a60b633d1b4835a9152427fb7e3fe3e4034672 (patch)
tree2e3e5787b1ff4040bc6578abcc5f966762cbe79c /engines/sky/control.cpp
parent2964bed5d203cc99a63681d5fe2438f6731ac051 (diff)
downloadscummvm-rg350-86a60b633d1b4835a9152427fb7e3fe3e4034672.tar.gz
scummvm-rg350-86a60b633d1b4835a9152427fb7e3fe3e4034672.tar.bz2
scummvm-rg350-86a60b633d1b4835a9152427fb7e3fe3e4034672.zip
Fixed long-standing font bug. We were using the control panel font for LINC
space and terminals, and the LINC font for the control panel. Since these fonts contain different sets of characters, this would often cause the wrong character to be displayed, particularly in non-English languages. This also explains why we had to use the "wrong" font for the control panel recently. The functions to patch the LINC character set (actually the control character set) should no longer be needed, and have been removed. Should fix bug #1669564. svn-id: r26275
Diffstat (limited to 'engines/sky/control.cpp')
-rw-r--r--engines/sky/control.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sky/control.cpp b/engines/sky/control.cpp
index d40aad5ad5..b795bf3c7b 100644
--- a/engines/sky/control.cpp
+++ b/engines/sky/control.cpp
@@ -437,7 +437,7 @@ void Control::doLoadSavePanel(void) {
_savedMouse = _skyMouse->giveCurrentMouseType();
_savedCharSet = _skyText->giveCurrentCharSet();
- _skyText->fnSetFont(1);
+ _skyText->fnSetFont(2);
_skyMouse->spriteMouse(MOUSE_NORMAL, 0, 0);
_lastButton = -1;
_curButtonText = 0;
@@ -462,7 +462,7 @@ void Control::doControlPanel(void) {
initPanel();
_savedCharSet = _skyText->giveCurrentCharSet();
- _skyText->fnSetFont(1);
+ _skyText->fnSetFont(2);
_skyScreen->clearScreen();
if (SkyEngine::_systemVars.gameVersion < 331)
@@ -1493,7 +1493,7 @@ uint16 Control::quickXRestore(uint16 slot) {
_mouseClicked = false;
_savedCharSet = _skyText->giveCurrentCharSet();
- _skyText->fnSetFont(1);
+ _skyText->fnSetFont(2);
_system->copyRectToScreen(_screenBuf, GAME_SCREEN_WIDTH, 0, 0, FULL_SCREEN_WIDTH, FULL_SCREEN_HEIGHT);
_system->updateScreen();