projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added constant text value
[rocksndiamonds.git]
/
src
/
events.c
diff --git
a/src/events.c
b/src/events.c
index c1c5e00d42994d454b4835ce82e36123fb13b360..21d9b5a3c23e529c6e6a525921ca24a587c936b3 100644
(file)
--- a/
src/events.c
+++ b/
src/events.c
@@
-1458,16
+1458,13
@@
void HandlePauseResumeEvent(PauseResumeEvent *event)
void HandleKeyEvent(KeyEvent *event)
{
int key_status = (event->type == EVENT_KEYPRESS ? KEY_PRESSED : KEY_RELEASED);
void HandleKeyEvent(KeyEvent *event)
{
int key_status = (event->type == EVENT_KEYPRESS ? KEY_PRESSED : KEY_RELEASED);
- boolean with_modifiers = (game_status == GAME_MODE_PLAYING ? FALSE : TRUE);
- Key key = GetEventKey(event, with_modifiers);
- Key keymod = (with_modifiers ? GetEventKey(event, FALSE) : key);
+ Key key = GetEventKey(event);
#if DEBUG_EVENTS_KEY
#if DEBUG_EVENTS_KEY
- Debug("event:key", "key was %s, keysym.scancode == %d, keysym.sym == %d,
keymod = %d,
GetKeyModState() = 0x%04x, resulting key == %d (%s)",
+ Debug("event:key", "key was %s, keysym.scancode == %d, keysym.sym == %d, GetKeyModState() = 0x%04x, resulting key == %d (%s)",
event->type == EVENT_KEYPRESS ? "pressed" : "released",
event->keysym.scancode,
event->keysym.sym,
event->type == EVENT_KEYPRESS ? "pressed" : "released",
event->keysym.scancode,
event->keysym.sym,
- keymod,
GetKeyModState(),
key,
getKeyNameFromKey(key));
GetKeyModState(),
key,
getKeyNameFromKey(key));
@@
-1495,7
+1492,7
@@
void HandleKeyEvent(KeyEvent *event)
}
#endif
}
#endif
- HandleKeyModState(key
mod
, key_status);
+ HandleKeyModState(key, key_status);
// process all keys if not in text input mode or if non-printable keys
if (!checkTextInputKey(key))
// process all keys if not in text input mode or if non-printable keys
if (!checkTextInputKey(key))
@@
-2284,6
+2281,16
@@
void HandleKey(Key key, int key_status)
return;
}
return;
}
+ if (game_status == GAME_MODE_MAIN &&
+ (setup.internal.info_screens_from_main ||
+ leveldir_current->info_screens_from_main) &&
+ (key >= KSYM_KP_1 && key <= KSYM_KP_9))
+ {
+ DrawInfoScreen_FromMainMenu(key - KSYM_KP_1 + 1);
+
+ return;
+ }
+
if (game_status == GAME_MODE_MAIN || game_status == GAME_MODE_PLAYING)
{
if (key == setup.shortcut.save_game)
if (game_status == GAME_MODE_MAIN || game_status == GAME_MODE_PLAYING)
{
if (key == setup.shortcut.save_game)