aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2015-05-01 18:34:51 -1000
committerPaul Gilbert2015-05-01 18:34:51 -1000
commit86dab70eae4791b84ca3891cad7db70a9683679a (patch)
treef21504b082dfa932857853220990b6ab41174908 /engines
parenta2ef3e240225940308c54243589014c922c38274 (diff)
downloadscummvm-rg350-86dab70eae4791b84ca3891cad7db70a9683679a.tar.gz
scummvm-rg350-86dab70eae4791b84ca3891cad7db70a9683679a.tar.bz2
scummvm-rg350-86dab70eae4791b84ca3891cad7db70a9683679a.zip
SHERLOCK: Remove unused key pad speed field
Diffstat (limited to 'engines')
-rw-r--r--engines/sherlock/settings.cpp7
-rw-r--r--engines/sherlock/sherlock.cpp1
-rw-r--r--engines/sherlock/sherlock.h1
-rw-r--r--engines/sherlock/user_interface.cpp7
4 files changed, 4 insertions, 12 deletions
diff --git a/engines/sherlock/settings.cpp b/engines/sherlock/settings.cpp
index fb7730fc1d..769c2c82e3 100644
--- a/engines/sherlock/settings.cpp
+++ b/engines/sherlock/settings.cpp
@@ -115,10 +115,11 @@ void Settings::drawInteface(bool flag) {
tempStr = Common::String::format("Portraits %s", SETUP_STRS0[people._portraitsOn]);
screen.makeButton(Common::Rect(SETUP_POINTS[10][0], SETUP_POINTS[10][1], SETUP_POINTS[10][2], SETUP_POINTS[10][1] + 10),
SETUP_POINTS[10][3] - screen.stringWidth(tempStr) / 2, tempStr);
- tempStr = Common::String::format("Key Pad %s", _vm->_keyPadSpeed ? "Fast" : "Slow");
+ tempStr = "Key Pad Slow";
screen.makeButton(Common::Rect(SETUP_POINTS[11][0], SETUP_POINTS[11][1], SETUP_POINTS[11][2], SETUP_POINTS[11][1] + 10),
SETUP_POINTS[11][3] - screen.stringWidth(tempStr) / 2, tempStr);
+ screen.buttonPrint(Common::Point(SETUP_POINTS[11][3], SETUP_POINTS[11][1]), COMMAND_NULL, false, tempStr);
// Show the window immediately, or slide it on-screen
if (!flag) {
@@ -196,8 +197,8 @@ 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 11:
- tempStr = Common::String::format("Key Pad %s", SETUP_STRS4[_vm->_keyPadSpeed]);
- screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, tempStr);
+ tempStr = "Key Pad Slow";
+ screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), COMMAND_NULL, true, tempStr);
break;
default:
screen.buttonPrint(Common::Point(SETUP_POINTS[idx][3], SETUP_POINTS[idx][1]), color, true, SETUP_NAMES[idx]);
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 3ab2caabc4..0282d3e5f0 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -47,7 +47,6 @@ SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gam
_ui = nullptr;
_useEpilogue2 = false;
_loadingSavedGame = false;
- _keyPadSpeed = 0;
_loadGameSlot = -1;
_canLoadSave = false;
}
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 02e2e99229..dfaaa70806 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -106,7 +106,6 @@ public:
Common::String _titleOverride;
bool _useEpilogue2;
bool _loadingSavedGame;
- int _keyPadSpeed;
int _loadGameSlot;
bool _canLoadSave;
public:
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 313f035bd5..cab0fb0ad8 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -1968,13 +1968,6 @@ void UserInterface::doControls() {
updateConfig = true;
settings.drawInteface(true);
}
-
- if ((found == 11 && events._released) || _key == 'K') {
- // Toggle keypad acceleration speed
- _vm->_keyPadSpeed ^= 1;
- updateConfig = true;
- settings.drawInteface(true);
- }
} while (!_vm->shouldQuit());
banishWindow();