[Scummvm-cvs-logs] SF.net SVN: scummvm:[48079] scummvm/trunk/engines/kyra
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Wed Feb 17 17:18:23 CET 2010
Revision: 48079
http://scummvm.svn.sourceforge.net/scummvm/?rev=48079&view=rev
Author: lordhoto
Date: 2010-02-17 16:18:23 +0000 (Wed, 17 Feb 2010)
Log Message:
-----------
Use Common::KEYCODE_* instead of ASCII values for keycode comparison.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/gui.cpp
scummvm/trunk/engines/kyra/kyra_v1.cpp
Modified: scummvm/trunk/engines/kyra/gui.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui.cpp 2010-02-17 16:08:47 UTC (rev 48078)
+++ scummvm/trunk/engines/kyra/gui.cpp 2010-02-17 16:18:23 UTC (rev 48079)
@@ -421,7 +421,7 @@
while (_vm->_eventMan->pollEvent(event) && running) {
switch (event.type) {
case Common::EVENT_KEYDOWN:
- if (event.kbd.keycode == 'q' && event.kbd.flags == Common::KBD_CTRL)
+ if (event.kbd.keycode == Common::KEYCODE_q && event.kbd.flags == Common::KBD_CTRL)
_vm->quitGame();
else
_keyPressed = event.kbd;
Modified: scummvm/trunk/engines/kyra/kyra_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.cpp 2010-02-17 16:08:47 UTC (rev 48078)
+++ scummvm/trunk/engines/kyra/kyra_v1.cpp 2010-02-17 16:18:23 UTC (rev 48079)
@@ -261,9 +261,9 @@
switch (event.type) {
case Common::EVENT_KEYDOWN:
- if (event.kbd.keycode >= '1' && event.kbd.keycode <= '9' &&
+ if (event.kbd.keycode >= Common::KEYCODE_1 && event.kbd.keycode <= Common::KEYCODE_9 &&
(event.kbd.flags == Common::KBD_CTRL || event.kbd.flags == Common::KBD_ALT) && mainLoop) {
- int saveLoadSlot = 9 - (event.kbd.keycode - '0') + 990;
+ int saveLoadSlot = 9 - (event.kbd.keycode - Common::KEYCODE_0) + 990;
if (event.kbd.flags == Common::KBD_CTRL) {
loadGameStateCheck(saveLoadSlot);
@@ -271,14 +271,14 @@
breakLoop = true;
} else {
char savegameName[14];
- sprintf(savegameName, "Quicksave %d", event.kbd.keycode - '0');
+ sprintf(savegameName, "Quicksave %d", event.kbd.keycode - Common::KEYCODE_0);
saveGameState(saveLoadSlot, savegameName, 0);
}
} else if (event.kbd.flags == Common::KBD_CTRL) {
- if (event.kbd.keycode == 'd') {
+ if (event.kbd.keycode == Common::KEYCODE_d) {
if (_debugger)
_debugger->attach();
- } else if (event.kbd.keycode == 'q') {
+ } else if (event.kbd.keycode == Common::KEYCODE_q) {
quitGame();
}
} else {
@@ -379,12 +379,12 @@
while (_eventMan->pollEvent(event)) {
switch (event.type) {
case Common::EVENT_KEYDOWN:
- if (event.kbd.keycode == '.' || event.kbd.keycode == Common::KEYCODE_ESCAPE ||
+ if (event.kbd.keycode == Common::KEYCODE_PERIOD || event.kbd.keycode == Common::KEYCODE_ESCAPE ||
event.kbd.keycode == Common::KEYCODE_SPACE || event.kbd.keycode == Common::KEYCODE_RETURN ||
event.kbd.keycode == Common::KEYCODE_UP || event.kbd.keycode == Common::KEYCODE_RIGHT ||
event.kbd.keycode == Common::KEYCODE_DOWN || event.kbd.keycode == Common::KEYCODE_LEFT)
_eventList.push_back(Event(event, true));
- else if (event.kbd.keycode == 'q' && event.kbd.flags == Common::KBD_CTRL)
+ else if (event.kbd.keycode == Common::KEYCODE_q && event.kbd.flags == Common::KBD_CTRL)
quitGame();
else
_eventList.push_back(event);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list