libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-24 05:01:43 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Cleaning up after myself (I blame it on, err, uhh... the Vogons?)

Browse Source 
svn-id: r27625
This commit is contained in:
Max Horn 2007-06-22 21:16:07 +00:00
parent 54d668ac13
commit 2fa0a5c457
8 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backends/platform/ds/arm9/source/touchkeyboard.cpp
View File

@ -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')) {

2
common/events.h
View File

@ -68,7 +68,7 @@ enum EventType {
};
enum KeyCode {
KEYCODE_INALID = 0,
KEYCODE_INVALID = 0,
KEYCODE_BACKSPACE = 8,
KEYCODE_TAB = 9,

2
engines/cine/main_loop.cpp
View File

@ -77,7 +77,7 @@ void manageEvents(int count) {
mouseLeft = 1;
}
break;
case Common::KEYCODE_ESC:
case Common::KEYCODE_ESCAPE:
if (allowPlayerInput) {
mouseRight = 1;
}

1
engines/cine/various.cpp
View File

@ -25,6 +25,7 @@
#include "common/stdafx.h"
#include "common/endian.h"
#include "common/events.h"
#include "common/savefile.h"
#include "cine/cine.h"

2
engines/kyra/kyra.cpp
View File

@ -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;
}

2
engines/lure/surface.cpp
View File

@ -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);

4
engines/queen/input.cpp
View File

@ -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 {

5
engines/sword1/control.cpp
View File

@ -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