diff options
| author | Paul Gilbert | 2018-02-19 09:46:32 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2018-02-19 09:46:32 -0500 |
| commit | 99c072e84495492a66e562a8dc0af6b39bf37d52 (patch) | |
| tree | df0e791568eb8c487eecf83e4c351a098e52864b | |
| parent | fbc184e3d9d00c6e894f71c98e6f7b05cf6afe0c (diff) | |
| download | scummvm-rg350-99c072e84495492a66e562a8dc0af6b39bf37d52.tar.gz scummvm-rg350-99c072e84495492a66e562a8dc0af6b39bf37d52.tar.bz2 scummvm-rg350-99c072e84495492a66e562a8dc0af6b39bf37d52.zip | |
XEEN: Fix input of new character names not allowing uppercase
| -rw-r--r-- | engines/xeen/dialogs_input.cpp | 19 | ||||
| -rw-r--r-- | engines/xeen/dialogs_input.h | 2 |
2 files changed, 10 insertions, 11 deletions
diff --git a/engines/xeen/dialogs_input.cpp b/engines/xeen/dialogs_input.cpp index a8979d6ae0..e44fb39387 100644 --- a/engines/xeen/dialogs_input.cpp +++ b/engines/xeen/dialogs_input.cpp @@ -42,7 +42,8 @@ int Input::getString(Common::String &line, uint maxLen, int maxWidth, bool isNum _window->update(); while (!_vm->shouldExit()) { - Common::KeyCode keyCode = waitForKey(msg); + Common::KeyState keyState = waitForKey(msg); + const Common::KeyCode keyCode = keyState.keycode; bool refresh = false; if ((keyCode == Common::KEYCODE_BACKSPACE || keyCode == Common::KEYCODE_DELETE) @@ -50,9 +51,9 @@ int Input::getString(Common::String &line, uint maxLen, int maxWidth, bool isNum line.deleteLastChar(); refresh = true; } else if (line.size() < maxLen && (line.size() > 0 || keyCode != Common::KEYCODE_SPACE) - && ((isNumeric && keyCode >= Common::KEYCODE_0 && keyCode < Common::KEYCODE_9) || - (!isNumeric && keyCode >= Common::KEYCODE_SPACE && keyCode < Common::KEYCODE_DELETE))) { - line += (char)keyCode; + && ((isNumeric && keyState.ascii >= '0' && keyState.ascii <= '9') || + (!isNumeric && keyState.ascii >= ' ' && keyState.ascii <= (char)127))) { + line += keyState.ascii; refresh = true; } else if (keyCode == Common::KEYCODE_RETURN || keyCode == Common::KEYCODE_KP_ENTER) { break; @@ -72,7 +73,7 @@ int Input::getString(Common::String &line, uint maxLen, int maxWidth, bool isNum return line.size(); } -Common::KeyCode Input::waitForKey(const Common::String &msg) { +Common::KeyState Input::waitForKey(const Common::String &msg) { EventsManager &events = *_vm->_events; Interface &intf = *_vm->_interface; Windows &windows = *_vm->_windows; @@ -85,7 +86,7 @@ Common::KeyCode Input::waitForKey(const Common::String &msg) { bool flag = !_vm->_startupWindowActive && !windows[25]._enabled && _vm->_mode != MODE_FF && _vm->_mode != MODE_17; - Common::KeyCode ch = Common::KEYCODE_INVALID; + Common::KeyState ks; while (!_vm->shouldExit()) { events.updateGameCounter(); @@ -101,9 +102,7 @@ Common::KeyCode Input::waitForKey(const Common::String &msg) { events.wait(1); if (events.isKeyPending()) { - Common::KeyState keyState; - events.getKey(keyState); - ch = keyState.keycode; + events.getKey(ks); break; } } @@ -114,7 +113,7 @@ Common::KeyCode Input::waitForKey(const Common::String &msg) { intf._tillMove = oldTillMove; intf._upDoorText = oldUpDoorText; - return ch; + return ks; } void Input::animateCursor() { diff --git a/engines/xeen/dialogs_input.h b/engines/xeen/dialogs_input.h index c6b0e69423..3451fbc681 100644 --- a/engines/xeen/dialogs_input.h +++ b/engines/xeen/dialogs_input.h @@ -34,7 +34,7 @@ private: /** * Draws the text input and cursor and waits until the user presses a key */ - Common::KeyCode waitForKey(const Common::String &msg); + Common::KeyState waitForKey(const Common::String &msg); /** * Animates the box text cursor |