projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19990108-1
[rocksndiamonds.git]
/
src
/
events.c
diff --git
a/src/events.c
b/src/events.c
index 53b8171422ab97d250b7f66508d5944fff877726..d29cfcfcf0d2d3100aeafe8aec024f16b65279c1 100644
(file)
--- a/
src/events.c
+++ b/
src/events.c
@@
-71,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;
}
@@
-270,22
+273,24
@@
void HandleButton(int mx, int my, int button)
{
static int old_mx = 0, old_my = 0;
{
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
{
old_mx = mx;
old_my = my;
}
else
{
old_mx = mx;
old_my = my;
- HandleGadgets(mx,my, button);
HandleVideoButtons(mx,my, button);
HandleSoundButtons(mx,my, button);
HandleGameButtons(mx,my, button);
}
HandleVideoButtons(mx,my, button);
HandleSoundButtons(mx,my, button);
HandleGameButtons(mx,my, button);
}
+ HandleGadgets(mx, my, button);
+
switch(game_status)
{
case MAINMENU:
switch(game_status)
{
case MAINMENU:
@@
-332,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]);
@@
-456,6
+466,8
@@
void HandleKey(KeySym key, int key_status)
+ HandleGadgetsKeyInput(key);
+
switch(game_status)
{
case TYPENAME:
switch(game_status)
{
case TYPENAME:
@@
-503,6
+515,7
@@
void HandleKey(KeySym key, int key_status)
break;
case LEVELED:
break;
case LEVELED:
+ HandleLevelEditorKeyInput(key);
LevelNameTyping(key);
break;
LevelNameTyping(key);
break;
@@
-546,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);
@@
-610,7
+639,7
@@
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;
}
@@
-676,7
+705,8
@@
void HandleJoystick()
{
static unsigned 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)