projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19980925
[rocksndiamonds.git]
/
src
/
events.c
diff --git
a/src/events.c
b/src/events.c
index 5f85101eb06ef4b6764c38034d140e0620b771f7..d2b364886627bc5412235e3f85cd260f1b63bd58 100644
(file)
--- a/
src/events.c
+++ b/
src/events.c
@@
-65,12
+65,18
@@
void EventLoop(void)
else /* got no event, but don't be lazy... */
{
HandleNoXEvent();
else /* got no event, but don't be lazy... */
{
HandleNoXEvent();
- Delay(1000); /* don't use all CPU time when idle */
- }
- XSync(display,FALSE);
+ /* don't use all CPU time when idle; the main loop while playing
+ has its own synchronization and is CPU friendly, too */
+
+ if (game_status != PLAYING)
+ {
+ XSync(display, FALSE);
+ Delay(10);
+ }
+ }
- if (game_status
==
EXITGAME)
+ if (game_status
==
EXITGAME)
return;
}
}
return;
}
}
@@
-170,10
+176,17
@@
void HandleExposeEvent(XExposeEvent *event)
SetDrawtoField(DRAW_DIRECT);
}
SetDrawtoField(DRAW_DIRECT);
}
- if (soft_scrolling_on && game_status==PLAYING)
+ if (soft_scrolling_on && game_status == PLAYING)
+ {
+ int fx = FX, fy = FY;
+
+ fx += (PlayerMovDir & (MV_LEFT|MV_RIGHT) ? ScreenMovPos : 0);
+ fy += (PlayerMovDir & (MV_UP|MV_DOWN) ? ScreenMovPos : 0);
+
XCopyArea(display,fieldbuffer,backbuffer,gc,
XCopyArea(display,fieldbuffer,backbuffer,gc,
-
FX,FY
, SXSIZE,SYSIZE,
+
fx,fy
, SXSIZE,SYSIZE,
SX,SY);
SX,SY);
+ }
XCopyArea(display,drawto,window,gc, x,y, width,height, x,y);
XCopyArea(display,drawto,window,gc, x,y, width,height, x,y);
@@
-285,9
+298,6
@@
void HandleButton(int mx, int my, int button)
}
}
}
}
-int GameSpeed = 2;
-int MoveSpeed = 8;
-
void HandleKey(KeySym key, int key_status)
{
int joy = 0;
void HandleKey(KeySym key, int key_status)
{
int joy = 0;
@@
-506,10
+516,11
@@
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)
- Game
Speed = 5
0;
+ Game
FrameDelay = 50
0;
else
else
- GameSpeed = key - XK_0;
- printf("GameSpeed == %d\n", GameSpeed);
+ GameFrameDelay = (key - XK_0) * 10;
+ printf("Game speed == %d%% (%d ms delay between two frames)\n",
+ GAME_FRAME_DELAY * 100 / GameFrameDelay, GameFrameDelay);
break;
case XK_a:
break;
case XK_a:
@@
-541,7
+552,7
@@
void HandleKey(KeySym key, int key_status)
case XK_Q:
#endif
case XK_q:
case XK_Q:
#endif
case XK_q:
-
D
ynamite = 1000;
+
local_player->d
ynamite = 1000;
break;
case XK_x:
break;
case XK_x:
@@
-582,15
+593,15
@@
void HandleKey(KeySym key, int key_status)
}
else
{
}
else
{
- Delay(1
000
);
+ Delay(1);
}
}
/*
}
}
/*
- Delay(160
000
/ num_steps);
+ Delay(160 / num_steps);
*/
/*
*/
/*
- Delay(120
000
/ num_steps);
+ Delay(120 / num_steps);
*/
}
}
*/
}
}
@@
-609,7
+620,7
@@
void HandleKey(KeySym key, int key_status)
0,0);
XFlush(display);
XSync(display,FALSE);
0,0);
XFlush(display);
XSync(display,FALSE);
- Delay(1000
000
);
+ Delay(1000);
}
break;
}
break;
@@
-697,6
+708,7
@@
void HandleJoystick()
break;
case PLAYING:
{
break;
case PLAYING:
{
+ static int player_frame_reset_delay = 0;
BOOL moved = FALSE, snapped = FALSE, bombed = FALSE;
if (GameOver && newbutton)
BOOL moved = FALSE, snapped = FALSE, bombed = FALSE;
if (GameOver && newbutton)
@@
-712,6
+724,8
@@
void HandleJoystick()
if (joy)
{
if (joy)
{
+ player_frame_reset_delay = 0;
+
if (button1)
snapped = SnapField(dx,dy);
else
if (button1)
snapped = SnapField(dx,dy);
else
@@
-734,7
+748,8
@@
void HandleJoystick()
{
DigField(0,0,0,0,DF_NO_PUSH);
SnapField(0,0);
{
DigField(0,0,0,0,DF_NO_PUSH);
SnapField(0,0);
- PlayerFrame = 0;
+ if (++player_frame_reset_delay > MoveSpeed)
+ PlayerFrame = 0;
}
if (tape.playing && !tape.pausing && !joy && tape.counter<tape.length)
}
if (tape.playing && !tape.pausing && !joy && tape.counter<tape.length)