projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19990109-1
[rocksndiamonds.git]
/
src
/
events.c
diff --git
a/src/events.c
b/src/events.c
index 2ef8fd6d4991a974defc5cc03b9bdb795b635a45..d29cfcfcf0d2d3100aeafe8aec024f16b65279c1 100644
(file)
--- a/
src/events.c
+++ b/
src/events.c
@@
-20,6
+20,7
@@
#include "misc.h"
#include "tape.h"
#include "joystick.h"
#include "misc.h"
#include "tape.h"
#include "joystick.h"
+#include "buttons.h"
#include "network.h"
/* values for key_status */
#include "network.h"
/* values for key_status */
@@
-70,6
+71,9
@@
void EventLoop(void)
Delay(10);
}
Delay(10);
}
+ /* refresh window contents from drawing buffer, if needed */
+ BackToFront();
+
if (game_status == EXITGAME)
return;
}
if (game_status == EXITGAME)
return;
}
@@
-258,19
+262,22
@@
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)
{
static int old_mx = 0, old_my = 0;
}
void HandleButton(int mx, int my, int button)
{
static int old_mx = 0, old_my = 0;
- if (
mx<0 || my<
0)
+ if (
button <
0)
{
mx = old_mx;
my = old_my;
{
mx = old_mx;
my = old_my;
+ button = -button;
}
else
{
}
else
{
@@
-282,6
+289,8
@@
void HandleButton(int mx, int my, int button)
HandleGameButtons(mx,my, button);
}
HandleGameButtons(mx,my, button);
}
+ HandleGadgets(mx, my, button);
+
switch(game_status)
{
case MAINMENU:
switch(game_status)
{
case MAINMENU:
@@
-328,7
+337,12
@@
void HandleButton(int mx, int my, int button)
int x = LEVELX(sx);
int y = LEVELY(sy);
int x = LEVELX(sx);
int y = LEVELY(sy);
- printf("INFO: Feld[%d][%d] == %d\n", x,y, Feld[x][y]);
+ printf("INFO: SCREEN(%d, %d), LEVEL(%d, %d)\n", sx, sy, x, y);
+
+ if (!IN_LEV_FIELD(x, y))
+ break;
+
+ printf(" Feld[%d][%d] == %d\n", x,y, Feld[x][y]);
printf(" Store[%d][%d] == %d\n", x,y, Store[x][y]);
printf(" Store2[%d][%d] == %d\n", x,y, Store2[x][y]);
printf(" StorePlayer[%d][%d] == %d\n", x,y, StorePlayer[x][y]);
printf(" Store[%d][%d] == %d\n", x,y, Store[x][y]);
printf(" Store2[%d][%d] == %d\n", x,y, Store2[x][y]);
printf(" StorePlayer[%d][%d] == %d\n", x,y, StorePlayer[x][y]);
@@
-425,7
+439,17
@@
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)
{
- CloseDoor(DOOR_CLOSE_1 | DOOR_NO_DELAY);
+ 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();
return;
game_status = MAINMENU;
DrawMainMenu();
return;
@@
-442,6
+466,8
@@
void HandleKey(KeySym key, int key_status)
+ HandleGadgetsKeyInput(key);
+
switch(game_status)
{
case TYPENAME:
switch(game_status)
{
case TYPENAME:
@@
-489,6
+515,7
@@
void HandleKey(KeySym key, int key_status)
break;
case LEVELED:
break;
case LEVELED:
+ HandleLevelEditorKeyInput(key);
LevelNameTyping(key);
break;
LevelNameTyping(key);
break;
@@
-532,6
+559,22
@@
void HandleKey(KeySym key, int key_status)
break;
#endif
break;
#endif
+#if 1
+ case XK_m:
+ if (MoveSpeed == 8)
+ {
+ MoveSpeed = 4;
+ ScrollStepSize = TILEX/4;
+ }
+ else
+ {
+ MoveSpeed = 8;
+ ScrollStepSize = TILEX/8;
+ }
+ printf("MoveSpeed == %d\n", MoveSpeed);
+ break;
+#endif
+
case XK_f:
ScrollStepSize = TILEX/8;
printf("ScrollStepSize == %d (1/8)\n", ScrollStepSize);
case XK_f:
ScrollStepSize = TILEX/8;
printf("ScrollStepSize == %d (1/8)\n", ScrollStepSize);
@@
-596,12
+639,14
@@
void HandleNoXEvent()
{
if (button_status && game_status != PLAYING)
{
{
if (button_status && game_status != PLAYING)
{
- HandleButton(
-1,-1,
button_status);
+ HandleButton(
0, 0, -
button_status);
return;
}
return;
}
+#ifndef MSDOS
if (options.network)
HandleNetworking();
if (options.network)
HandleNetworking();
+#endif
HandleJoystick();
HandleJoystick();
@@
-618,12
+663,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;
}
@@
-651,9
+703,10
@@
void HandleJoystick()
case SETUP:
case SETUPINPUT:
{
case SETUP:
case SETUPINPUT:
{
- static long joystickmove_delay = 0;
+ static
unsigned
long joystickmove_delay = 0;
- if (joystick && !button && !DelayReached(&joystickmove_delay, 150))
+ if (joystick && !button &&
+ !DelayReached(&joystickmove_delay, GADGET_FRAME_DELAY))
newbutton = dx = dy = 0;
if (game_status==MAINMENU)
newbutton = dx = dy = 0;
if (game_status==MAINMENU)