projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20040921-1-src
[rocksndiamonds.git]
/
src
/
game.c
diff --git
a/src/game.c
b/src/game.c
index cb8a7974bcf2a5f5345cd7b50b22fa6b723c4040..8bf4818494aafa34495fd81a1036fb7b778b3037 100644
(file)
--- a/
src/game.c
+++ b/
src/game.c
@@
-8529,8
+8529,8
@@
void AdvanceFrameAndPlayerCounters(int player_nr)
void GameActions()
{
void GameActions()
{
- static unsigned long
action
_delay = 0;
- unsigned long
action
_delay_value;
+ static unsigned long
game_frame
_delay = 0;
+ unsigned long
game_frame
_delay_value;
int magic_wall_x = 0, magic_wall_y = 0;
int i, x, y, element, graphic;
byte *recorded_player_action;
int magic_wall_x = 0, magic_wall_y = 0;
int i, x, y, element, graphic;
byte *recorded_player_action;
@@
-8542,15
+8542,15
@@
void GameActions()
if (game_status != GAME_MODE_PLAYING)
return;
if (game_status != GAME_MODE_PLAYING)
return;
-
action
_delay_value =
+
game_frame
_delay_value =
(tape.playing && tape.fast_forward ? FfwdFrameDelay : GameFrameDelay);
if (tape.playing && tape.warp_forward && !tape.pausing)
(tape.playing && tape.fast_forward ? FfwdFrameDelay : GameFrameDelay);
if (tape.playing && tape.warp_forward && !tape.pausing)
-
action
_delay_value = 0;
+
game_frame
_delay_value = 0;
/* ---------- main game synchronization point ---------- */
/* ---------- main game synchronization point ---------- */
- WaitUntilDelayReached(&
action_delay, action
_delay_value);
+ WaitUntilDelayReached(&
game_frame_delay, game_frame
_delay_value);
if (network_playing && !network_player_action_received)
{
if (network_playing && !network_player_action_received)
{