projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into releases
[rocksndiamonds.git]
/
src
/
game.h
diff --git
a/src/game.h
b/src/game.h
index a8345e27e3518b3392774640d26de626ac80a19d..50490be33c0a3527fec1a9f921e1823ddc450217 100644
(file)
--- a/
src/game.h
+++ b/
src/game.h
@@
-122,6
+122,7
@@
struct GameInfo
boolean use_masked_pushing;
int forced_scroll_delay_value;
int scroll_delay_value;
boolean use_masked_pushing;
int forced_scroll_delay_value;
int scroll_delay_value;
+ int tile_size;
/* values for engine initialization */
int default_push_delay_fixed;
/* values for engine initialization */
int default_push_delay_fixed;
@@
-155,6
+156,7
@@
struct GameInfo
boolean gravity;
boolean explosions_delayed;
boolean envelope_active;
boolean gravity;
boolean explosions_delayed;
boolean envelope_active;
+ boolean no_time_limit; /* (variable only in very special case) */
/* values for the new EMC elements */
int lenses_time_left;
/* values for the new EMC elements */
int lenses_time_left;
@@
-177,7
+179,7
@@
struct GameInfo
boolean set_centered_player;
/* values for random number generator initialization after snapshot */
boolean set_centered_player;
/* values for random number generator initialization after snapshot */
- unsigned
long
num_random_calls;
+ unsigned
int
num_random_calls;
};
struct PlayerInfo
};
struct PlayerInfo
@@
-277,7
+279,7
@@
struct PlayerInfo
int push_delay;
int push_delay_value;
int push_delay;
int push_delay_value;
- unsigned
long
actual_frame_counter;
+ unsigned
int
actual_frame_counter;
int drop_delay;
int drop_pressed_delay;
int drop_delay;
int drop_pressed_delay;
@@
-330,7
+332,7
@@
void Moving2Blocked(int, int, int *, int *);
void Blocked2Moving(int, int, int *, int *);
void DrawDynamite(int, int);
void Blocked2Moving(int, int, int *, int *);
void DrawDynamite(int, int);
-void StartGameActions(boolean, boolean,
long
);
+void StartGameActions(boolean, boolean,
int
);
void GameActions(void);
void GameActions_EM_Main();
void GameActions(void);
void GameActions_EM_Main();
@@
-349,7
+351,7
@@
void RaiseScoreElement(int);
void RequestQuitGameExt(boolean, boolean, char *);
void RequestQuitGame(boolean);
void RequestQuitGameExt(boolean, boolean, char *);
void RequestQuitGame(boolean);
-unsigned int InitEngineRandom_RND(
long
);
+unsigned int InitEngineRandom_RND(
int
);
unsigned int RND(int);
void FreeEngineSnapshot();
unsigned int RND(int);
void FreeEngineSnapshot();