X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fevents.c;h=2ef8fd6d4991a974defc5cc03b9bdb795b635a45;hb=4f767d54c7ac468e9a42e22caf716111be1ceba9;hp=15f7205117ff592c9fac0de054796a5f2ae2a5df;hpb=21c25c56356db2138816a0716d73934ac3893e89;p=rocksndiamonds.git diff --git a/src/events.c b/src/events.c index 15f72051..2ef8fd6d 100644 --- a/src/events.c +++ b/src/events.c @@ -22,6 +22,11 @@ #include "joystick.h" #include "network.h" +/* values for key_status */ +#define KEY_NOT_PRESSED FALSE +#define KEY_RELEASED FALSE +#define KEY_PRESSED TRUE + void EventLoop(void) { while(1) @@ -426,9 +431,17 @@ void HandleKey(KeySym key, int key_status) return; } + + +#ifndef DEBUG + if (game_status == PLAYING && (tape.playing || tape.pausing)) return; +#endif + + + switch(game_status) { case TYPENAME: @@ -496,7 +509,12 @@ void HandleKey(KeySym key, int key_status) case XK_8: case XK_9: if (key == XK_0) - GameFrameDelay = 500; + { + if (GameFrameDelay == 500) + GameFrameDelay = GAME_FRAME_DELAY; + else + GameFrameDelay = 500; + } else GameFrameDelay = (key - XK_0) * 10; printf("Game speed == %d%% (%d ms delay between two frames)\n", @@ -635,7 +653,7 @@ void HandleJoystick() { static long joystickmove_delay = 0; - if (joystick && !button && !DelayReached(&joystickmove_delay,150)) + if (joystick && !button && !DelayReached(&joystickmove_delay, 150)) newbutton = dx = dy = 0; if (game_status==MAINMENU)