diff options
| author | Martin Kiewitz | 2016-01-30 19:22:49 +0100 |
|---|---|---|
| committer | Martin Kiewitz | 2016-01-30 19:22:49 +0100 |
| commit | d79728114ef61dd8761bee2966701667a41daf13 (patch) | |
| tree | 2ca15993a7759682dcbfe0bd4a1e0950fd7a050a /engines/sherlock/scalpel/scalpel_talk.cpp | |
| parent | 7d20df856703fa57015dfb6b613d9478a8042987 (diff) | |
| download | scummvm-rg350-d79728114ef61dd8761bee2966701667a41daf13.tar.gz scummvm-rg350-d79728114ef61dd8761bee2966701667a41daf13.tar.bz2 scummvm-rg350-d79728114ef61dd8761bee2966701667a41daf13.zip | |
SHERLOCK: SS: make main buttons multilingual
Also fix graphical issue with "press any key to continue" text
Diffstat (limited to 'engines/sherlock/scalpel/scalpel_talk.cpp')
| -rw-r--r-- | engines/sherlock/scalpel/scalpel_talk.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/engines/sherlock/scalpel/scalpel_talk.cpp b/engines/sherlock/scalpel/scalpel_talk.cpp index f82ad099aa..b6c14aaa87 100644 --- a/engines/sherlock/scalpel/scalpel_talk.cpp +++ b/engines/sherlock/scalpel/scalpel_talk.cpp @@ -684,7 +684,6 @@ Common::Point ScalpelTalk::get3doPortraitPosition() const { } void ScalpelTalk::drawInterface() { - FixedText &fixedText = *_vm->_fixedText; ScalpelScreen &screen = *(ScalpelScreen *)_vm->_screen; Surface &bb = *screen._backBuffer; @@ -698,9 +697,9 @@ void ScalpelTalk::drawInterface() { SHERLOCK_SCREEN_HEIGHT - 2), INV_BACKGROUND); if (_talkTo != -1) { - Common::String fixedText_Exit = fixedText.getText(kFixedText_Window_Exit); - Common::String fixedText_Up = fixedText.getText(kFixedText_Window_Up); - Common::String fixedText_Down = fixedText.getText(kFixedText_Window_Down); + Common::String fixedText_Exit = FIXED(Window_Exit); + Common::String fixedText_Up = FIXED(Window_Up); + Common::String fixedText_Down = FIXED(Window_Down); screen.makeButton(Common::Rect(99, CONTROLS_Y, 139, CONTROLS_Y + 10), 119, fixedText_Exit); @@ -709,14 +708,10 @@ void ScalpelTalk::drawInterface() { screen.makeButton(Common::Rect(181, CONTROLS_Y, 221, CONTROLS_Y + 10), 200, fixedText_Down); } else { - Common::String fixedText_PressKeyToContinue = fixedText.getText(kFixedText_PressKey_ToContinue); - Common::String fixedText_PressKeyToContinueHotkey = fixedText.getText(kFixedText_PressKey_ToContinueHotkey); - int fixedText_PressKeyToContinueLen = screen.stringWidth(fixedText_PressKeyToContinue); + Common::String fixedText_PressKeyToContinue = FIXED(PressKey_ToContinue); screen.makeButton(Common::Rect(46, CONTROLS_Y, 273, CONTROLS_Y + 10), - 160, fixedText_PressKeyToContinue); - screen.gPrint(Common::Point(160 - fixedText_PressKeyToContinueLen / 2, CONTROLS_Y), COMMAND_FOREGROUND, - "%s", fixedText_PressKeyToContinueHotkey.c_str()); + 160, fixedText_PressKeyToContinue, true); } } |