diff options
| author | Paul Gilbert | 2015-04-21 02:06:24 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2015-04-21 02:06:24 -0500 |
| commit | a81686b0e1108fc5e9cac79e8e5890ad8c0f8c23 (patch) | |
| tree | 40796515806af74b25505d68db51a2d39a695ebd | |
| parent | 6d2bde38ec883f00b9e4254f869e6349b21e0d28 (diff) | |
| download | scummvm-rg350-a81686b0e1108fc5e9cac79e8e5890ad8c0f8c23.tar.gz scummvm-rg350-a81686b0e1108fc5e9cac79e8e5890ad8c0f8c23.tar.bz2 scummvm-rg350-a81686b0e1108fc5e9cac79e8e5890ad8c0f8c23.zip | |
SHERLOCK: Fix Setup dialog button handling
| -rw-r--r-- | engines/sherlock/sherlock.h | 1 | ||||
| -rw-r--r-- | engines/sherlock/user_interface.cpp | 18 | ||||
| -rw-r--r-- | engines/sherlock/user_interface.h | 2 |
3 files changed, 12 insertions, 9 deletions
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h index 42e2cf8b38..67c7a2864d 100644 --- a/engines/sherlock/sherlock.h +++ b/engines/sherlock/sherlock.h @@ -105,7 +105,6 @@ public: Common::Point _over; // Old map position bool _onChessboard; bool _slowChess; - bool _joystick; int _keyPadSpeed; public: SherlockEngine(OSystem *syst, const SherlockGameDescription *gameDesc); diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp index 43ae76f94b..3ab705e26c 100644 --- a/engines/sherlock/user_interface.cpp +++ b/engines/sherlock/user_interface.cpp @@ -146,7 +146,8 @@ void Settings::drawInteface(bool flag) { SETUP_POINTS[4][3] - screen.stringWidth(tempStr) / 2, tempStr); screen.makeButton(Common::Rect(SETUP_POINTS[5][0], SETUP_POINTS[5][1], SETUP_POINTS[5][2], SETUP_POINTS[5][1] + 10), SETUP_POINTS[5][3] - screen.stringWidth("New Font Style") / 2, "New Font Style"); - tempStr = Common::String::format("Joystick %s", SETUP_STRS0[_vm->_joystick ? 1 : 0]); + + tempStr = Common::String::format("Joystick %s", SETUP_STRS0[0]); screen.makeButton(Common::Rect(SETUP_POINTS[6][0], SETUP_POINTS[6][1], SETUP_POINTS[6][2], SETUP_POINTS[6][1] + 10), SETUP_POINTS[6][3] - screen.stringWidth(tempStr) / 2, tempStr); screen.makeButton(Common::Rect(SETUP_POINTS[7][0], SETUP_POINTS[7][1], SETUP_POINTS[7][2], SETUP_POINTS[7][1] + 10), @@ -221,7 +222,7 @@ int Settings::drawButtons(const Common::Point &pt, int key) { screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr); break; case 6: - tempStr = Common::String::format("Joystick %s", SETUP_STRS0[_vm->_joystick]); + tempStr = Common::String::format("Joystick %s", SETUP_STRS0[0]); screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr); break; case 8: @@ -1793,16 +1794,19 @@ void UserInterface::doControls() { if ((found == 5 && events._released) || _key == 'N') { // New font style - screen.setFont((screen.fontNumber() + 1) & 3); - } + int fontNum = screen.fontNumber() + 1; + if (fontNum == 3) + fontNum = 0; - if ((found == 6 && events._released) || _key == 'J') { - // Toggle joystick - _vm->_joystick = !_vm->_joystick; + screen.setFont(fontNum); updateConfig = true; settings.drawInteface(true); } + if ((found == 6 && events._released) || _key == 'J') { + // Toggle joystick - not implemented under ScummVM + } + if ((found == 7 && events._released) || _key == 'C') { // Calibrate joystick - No implementation in ScummVM } diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h index 23aca4e536..211287c372 100644 --- a/engines/sherlock/user_interface.h +++ b/engines/sherlock/user_interface.h @@ -67,7 +67,7 @@ class Settings { private: SherlockEngine *_vm; public: - Settings(SherlockEngine *vm) : _vm() {} + Settings(SherlockEngine *vm) : _vm(vm) {} void drawInteface(bool flag); |