projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19990314-2-src
[rocksndiamonds.git]
/
src
/
events.c
diff --git
a/src/events.c
b/src/events.c
index a336f013d3a5ae35140ad8095734aa216e643a58..60a6ceb3080efa7866519fd7c0de30d1efe2e6c9 100644
(file)
--- a/
src/events.c
+++ b/
src/events.c
@@
-299,13
+299,15
@@
void HandleFocusEvent(XFocusChangeEvent *event)
would be far better) set for each X11 window individually.
The effect would be keyboard auto repeat while playing the game
(game_status == PLAYING), which is not desired.
would be far better) set for each X11 window individually.
The effect would be keyboard auto repeat while playing the game
(game_status == PLAYING), which is not desired.
- To avoid this special case, we just wait 1/
5
0 second before
+ To avoid this special case, we just wait 1/
1
0 second before
processing the 'FocusIn' event.
*/
processing the 'FocusIn' event.
*/
- Delay(20);
if (game_status == PLAYING)
if (game_status == PLAYING)
+ {
+ Delay(100);
XAutoRepeatOff(display);
XAutoRepeatOff(display);
+ }
if (old_joystick_status != -1)
joystick_status = old_joystick_status;
}
if (old_joystick_status != -1)
joystick_status = old_joystick_status;
}
@@
-334,12
+336,6
@@
void HandleButton(int mx, int my, int button)
{
old_mx = mx;
old_my = my;
{
old_mx = mx;
old_my = my;
-
- /*
- HandleVideoButtons(mx,my, button);
- HandleSoundButtons(mx,my, button);
- HandleGameButtons(mx,my, button);
- */
}
HandleGadgets(mx, my, button);
}
HandleGadgets(mx, my, button);
@@
-491,16
+487,6
@@
void HandleKey(KeySym key, int key_status)
/* allow quick escape to the main menu with the Escape key */
if (key == XK_Escape && game_status != MAINMENU)
{
/* allow quick escape to the main menu with the Escape key */
if (key == XK_Escape && game_status != MAINMENU)
{
- if (game_status == LEVELED)
- {
- /* draw smaller door */
- XCopyArea(display, pix[PIX_DOOR], drawto, gc,
- DOOR_GFX_PAGEX7, 64,
- 108, 64,
- EX - 4, EY - 12);
- redraw_mask |= REDRAW_ALL;
- }
-
CloseDoor(DOOR_CLOSE_1 | DOOR_OPEN_2 | DOOR_NO_DELAY);
game_status = MAINMENU;
DrawMainMenu();
CloseDoor(DOOR_CLOSE_1 | DOOR_OPEN_2 | DOOR_NO_DELAY);
game_status = MAINMENU;
DrawMainMenu();
@@
-610,7
+596,7
@@
void HandleKey(KeySym key, int key_status)
break;
#endif
break;
#endif
-#if
1
+#if
0
case XK_m:
if (MoveSpeed == 8)
{
case XK_m:
if (MoveSpeed == 8)
{