diff options
| -rw-r--r-- | backends/platform/ds/arm9/source/touchkeyboard.cpp | 4 | ||||
| -rw-r--r-- | common/events.h | 2 | ||||
| -rw-r--r-- | engines/cine/main_loop.cpp | 2 | ||||
| -rw-r--r-- | engines/cine/various.cpp | 1 | ||||
| -rw-r--r-- | engines/kyra/kyra.cpp | 2 | ||||
| -rw-r--r-- | engines/lure/surface.cpp | 2 | ||||
| -rw-r--r-- | engines/queen/input.cpp | 4 | ||||
| -rw-r--r-- | engines/sword1/control.cpp | 5 |
8 files changed, 12 insertions, 10 deletions
diff --git a/backends/platform/ds/arm9/source/touchkeyboard.cpp b/backends/platform/ds/arm9/source/touchkeyboard.cpp index 931f9a716a..8f7af668d8 100644 --- a/backends/platform/ds/arm9/source/touchkeyboard.cpp +++ b/backends/platform/ds/arm9/source/touchkeyboard.cpp @@ -117,7 +117,7 @@ key_data keys[DS_NUM_KEYS] = { {51, 29, 6, Common::KEYCODE_UP}, // Close button - {56, 30, 0, Common::KEYCODE_INALID}, + {56, 30, 0, Common::KEYCODE_INVALID}, }; @@ -237,7 +237,7 @@ void addKeyboardEvents() { Common::Event event; // consolePrintf("Key: %d\n", r); - if ((keys[r].character == Common::KEYCODE_INALID)) { + if ((keys[r].character == Common::KEYCODE_INVALID)) { // Close button DS::closed = true; } else if ((keys[r].character >= '0') && (keys[r].character <= '9')) { diff --git a/common/events.h b/common/events.h index 39c7ad49e8..6eb26046ce 100644 --- a/common/events.h +++ b/common/events.h @@ -68,7 +68,7 @@ enum EventType { }; enum KeyCode { - KEYCODE_INALID = 0, + KEYCODE_INVALID = 0, KEYCODE_BACKSPACE = 8, KEYCODE_TAB = 9, diff --git a/engines/cine/main_loop.cpp b/engines/cine/main_loop.cpp index 7ad20a7ec7..89a0f3e6fc 100644 --- a/engines/cine/main_loop.cpp +++ b/engines/cine/main_loop.cpp @@ -77,7 +77,7 @@ void manageEvents(int count) { mouseLeft = 1; } break; - case Common::KEYCODE_ESC: + case Common::KEYCODE_ESCAPE: if (allowPlayerInput) { mouseRight = 1; } diff --git a/engines/cine/various.cpp b/engines/cine/various.cpp index e17f68b36b..281c4807b8 100644 --- a/engines/cine/various.cpp +++ b/engines/cine/various.cpp @@ -25,6 +25,7 @@ #include "common/stdafx.h" #include "common/endian.h" +#include "common/events.h" #include "common/savefile.h" #include "cine/cine.h" diff --git a/engines/kyra/kyra.cpp b/engines/kyra/kyra.cpp index 7e4f5103e7..249a5f6c21 100644 --- a/engines/kyra/kyra.cpp +++ b/engines/kyra/kyra.cpp @@ -617,7 +617,7 @@ void KyraEngine::delay(uint32 amount, bool update, bool isMainLoop) { _quitFlag = true; } else if (event.kbd.keycode == '.') _skipFlag = true; - else if (event.kbd.keycode == Common::KEYCODE_RETURN || event.kbd.keycode == Common::KEYCODE_SPACE || event.kbd.keycode == Common::KEYCODE_ESC) { + else if (event.kbd.keycode == Common::KEYCODE_RETURN || event.kbd.keycode == Common::KEYCODE_SPACE || event.kbd.keycode == Common::KEYCODE_ESCAPE) { _abortIntroFlag = true; _skipFlag = true; } diff --git a/engines/lure/surface.cpp b/engines/lure/surface.cpp index 0775d4261b..2642b929eb 100644 --- a/engines/lure/surface.cpp +++ b/engines/lure/surface.cpp @@ -430,7 +430,7 @@ bool Surface::getString(Common::String &line, int maxSize, bool isNumeric, bool mouse.cursorOn(); return true; } - else if (keycode == Common::KEYCODE_ESC) { + else if (keycode == Common::KEYCODE_ESCAPE) { // Escape character screen.screen().fillRect( Rect(x, y, x + maxSize - 1, y + FONT_HEIGHT), bgColour); diff --git a/engines/queen/input.cpp b/engines/queen/input.cpp index 7775988766..10a8664c0e 100644 --- a/engines/queen/input.cpp +++ b/engines/queen/input.cpp @@ -55,7 +55,7 @@ Input::Input(Common::Language language, OSystem *system) : _system(system), _eventMan(system->getEventManager()), _fastMode(false), _keyVerb(VERB_NONE), _cutawayRunning(false), _canQuit(false), _cutawayQuit(false), _dialogueRunning(false), _talkQuit(false), - _quickSave(false), _quickLoad(false), _debugger(false), _inKey(Common::KEYCODE_INALID), + _quickSave(false), _quickLoad(false), _debugger(false), _inKey(Common::KEYCODE_INVALID), _mouseButton(0), _idleTime(0) { switch (language) { @@ -201,7 +201,7 @@ void Input::checkKeys() { break; } - _inKey = Common::KEYCODE_INALID; // reset + _inKey = Common::KEYCODE_INVALID; // reset } Common::Point Input::getMousePos() const { diff --git a/engines/sword1/control.cpp b/engines/sword1/control.cpp index 62dd0ecb6b..108773fc23 100644 --- a/engines/sword1/control.cpp +++ b/engines/sword1/control.cpp @@ -1047,9 +1047,10 @@ void Control::delay(uint32 msecs) { case Common::EVENT_KEYDOWN: // Make sure backspace works right (this fixes a small issue on OS X) - if (event.kbd.keycode == Common::KEYCODE_BACKSPACE) + if (event.kbd.keycode == Common::KEYCODE_BACKSPACE) { +printf("Mac backspace workaround, was %d\n", event.kbd.ascii); _keyPressed = 8; - else + } else _keyPressed = (byte)event.kbd.ascii; // we skip the rest of the delay and return immediately // to handle keyboard input |