projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19981224-1
[rocksndiamonds.git]
/
src
/
game.c
diff --git
a/src/game.c
b/src/game.c
index 8b5d2a79f7a5cc4bc6e2f5305540b9c45ad61c51..682c45166c7db137453585b500c6498dfeae11ba 100644
(file)
--- a/
src/game.c
+++ b/
src/game.c
@@
-101,6
+101,7
@@
int game_emulation = EMU_NONE;
+
#ifdef DEBUG
#if 0
static unsigned int getStateCheckSum(int counter)
#ifdef DEBUG
#if 0
static unsigned int getStateCheckSum(int counter)
@@
-153,6
+154,7
@@
static unsigned int getStateCheckSum(int counter)
+
void GetPlayerConfig()
{
if (sound_status == SOUND_OFF)
void GetPlayerConfig()
{
if (sound_status == SOUND_OFF)
@@
-1051,7
+1053,7
@@
void Explode(int ex, int ey, int phase, int mode)
}
if (center_element == EL_MAMPFER)
}
if (center_element == EL_MAMPFER)
- MampferNr = (MampferNr
+1) % 4
;
+ MampferNr = (MampferNr
+ 1) % MampferMax
;
return;
}
return;
}
@@
-2421,8
+2423,8
@@
void AmoebeUmwandeln2(int ax, int ay, int new_element)
void AmoebeWaechst(int x, int y)
{
void AmoebeWaechst(int x, int y)
{
- static long sound_delay = 0;
- static
int
sound_delay_value = 0;
+ static
unsigned
long sound_delay = 0;
+ static
unsigned long
sound_delay_value = 0;
if (!MovDelay[x][y]) /* start new growing cycle */
{
if (!MovDelay[x][y]) /* start new growing cycle */
{
@@
-3111,8
+3113,8
@@
static void PlayerActions(struct PlayerInfo *player, byte player_action)
void GameActions()
{
void GameActions()
{
- static long action_delay = 0;
- long action_delay_value;
+ static
unsigned
long action_delay = 0;
+
unsigned
long action_delay_value;
int sieb_x = 0, sieb_y = 0;
int i, x, y, element;
byte *recorded_player_action;
int sieb_x = 0, sieb_y = 0;
int i, x, y, element;
byte *recorded_player_action;
@@
-3143,9
+3145,6
@@
void GameActions()
#if 1
WaitUntilDelayReached(&action_delay, action_delay_value);
#else
#if 1
WaitUntilDelayReached(&action_delay, action_delay_value);
#else
- /*
- while (!DelayReached(&action_delay, action_delay_value));
- */
while (!DelayReached(&action_delay, action_delay_value))
{
while (!DelayReached(&action_delay, action_delay_value))
{
@@
-3157,7
+3156,6
@@
void GameActions()
}
print_debug("done");
}
print_debug("done");
-
#endif
#endif
@@
-3742,7
+3740,7
@@
void ScrollFigure(struct PlayerInfo *player, int mode)
void ScrollScreen(struct PlayerInfo *player, int mode)
{
void ScrollScreen(struct PlayerInfo *player, int mode)
{
- static long screen_frame_counter = 0;
+ static
unsigned
long screen_frame_counter = 0;
if (mode == SCROLL_INIT)
{
if (mode == SCROLL_INIT)
{