projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19981202-2
[rocksndiamonds.git]
/
src
/
events.c
diff --git
a/src/events.c
b/src/events.c
index 15f7205117ff592c9fac0de054796a5f2ae2a5df..7f71d4b790c68cf13fda22c0bb4dba5d4a6dfa30 100644
(file)
--- a/
src/events.c
+++ b/
src/events.c
@@
-22,6
+22,11
@@
#include "joystick.h"
#include "network.h"
#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)
void EventLoop(void)
{
while(1)
@@
-253,9
+258,11
@@
void HandleFocusEvent(XFocusChangeEvent *event)
void HandleClientMessageEvent(XClientMessageEvent *event)
{
void HandleClientMessageEvent(XClientMessageEvent *event)
{
+#ifndef MSDOS
if ((event->window == window) &&
(event->data.l[0] == XInternAtom(display, "WM_DELETE_WINDOW", FALSE)))
CloseAllAndExit(0);
if ((event->window == window) &&
(event->data.l[0] == XInternAtom(display, "WM_DELETE_WINDOW", FALSE)))
CloseAllAndExit(0);
+#endif
}
void HandleButton(int mx, int my, int button)
}
void HandleButton(int mx, int my, int button)
@@
-426,9
+433,17
@@
void HandleKey(KeySym key, int key_status)
return;
}
return;
}
+
+
+#ifndef DEBUG
+
if (game_status == PLAYING && (tape.playing || tape.pausing))
return;
if (game_status == PLAYING && (tape.playing || tape.pausing))
return;
+#endif
+
+
+
switch(game_status)
{
case TYPENAME:
switch(game_status)
{
case TYPENAME:
@@
-496,7
+511,12
@@
void HandleKey(KeySym key, int key_status)
case XK_8:
case XK_9:
if (key == XK_0)
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",
else
GameFrameDelay = (key - XK_0) * 10;
printf("Game speed == %d%% (%d ms delay between two frames)\n",
@@
-582,8
+602,10
@@
void HandleNoXEvent()
return;
}
return;
}
+#ifndef MSDOS
if (options.network)
HandleNetworking();
if (options.network)
HandleNetworking();
+#endif
HandleJoystick();
HandleJoystick();
@@
-600,12
+622,19
@@
static int HandleJoystickForAllPlayers()
{
byte joy_action = 0;
{
byte joy_action = 0;
+ /*
if (!setup.input[i].use_joystick)
continue;
if (!setup.input[i].use_joystick)
continue;
+ */
joy_action = Joystick(i);
result |= joy_action;
joy_action = Joystick(i);
result |= joy_action;
+
+ if (!setup.input[i].use_joystick)
+ continue;
+
+
stored_player[i].action = joy_action;
}
stored_player[i].action = joy_action;
}
@@
-635,7
+664,7
@@
void HandleJoystick()
{
static long joystickmove_delay = 0;
{
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)
newbutton = dx = dy = 0;
if (game_status==MAINMENU)