projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version number set to 4.3.8.0
[rocksndiamonds.git]
/
src
/
game.h
diff --git
a/src/game.h
b/src/game.h
index e96f7f9386c8acd2158fc35206b34ba3ba38179a..c555578b4ae8ce4a2f8755d380e51bcb18d7aced 100644
(file)
--- a/
src/game.h
+++ b/
src/game.h
@@
-163,6
+163,8
@@
struct GameInfo
boolean use_masked_pushing;
boolean use_masked_elements;
boolean use_masked_elements_initial;
boolean use_masked_pushing;
boolean use_masked_elements;
boolean use_masked_elements_initial;
+ int forced_scroll_x;
+ int forced_scroll_y;
int forced_scroll_delay_value;
int scroll_delay_value;
int tile_size;
int forced_scroll_delay_value;
int scroll_delay_value;
int tile_size;
@@
-204,7
+206,7
@@
struct GameInfo
boolean explosions_delayed;
boolean envelope_active;
boolean no_level_time_limit; // (variable only in very special case)
boolean explosions_delayed;
boolean envelope_active;
boolean no_level_time_limit; // (variable only in very special case)
- boolean time_limit; // forced by setup option
+ boolean time_limit; // forced by
levelset config or
setup option
int time_final; // time (in seconds) or steps left or played
int score_time_final; // time (in frames) or steps played
int time_final; // time (in seconds) or steps left or played
int score_time_final; // time (in frames) or steps played
@@
-242,12
+244,8
@@
struct GameInfo
// values for special game initialization control
boolean restart_level;
// values for special game initialization control
boolean restart_level;
- // trigger message to ask for restarting the game
- char *restart_game_message;
-
// values for special request dialog control
boolean request_active;
// values for special request dialog control
boolean request_active;
- boolean request_active_or_moving;
// values for special game control
int centered_player_nr;
// values for special game control
int centered_player_nr;
@@
-277,6
+275,8
@@
struct GameInfo
int LevelSolved_CountingTime;
int LevelSolved_CountingScore;
int LevelSolved_CountingHealth;
int LevelSolved_CountingTime;
int LevelSolved_CountingScore;
int LevelSolved_CountingHealth;
+
+ boolean RestartGameRequested;
};
struct PlayerInfo
};
struct PlayerInfo
@@
-379,7
+379,7
@@
struct PlayerInfo
int push_delay;
int push_delay_value;
int push_delay;
int push_delay_value;
-
unsigned int
actual_frame_counter;
+
DelayCounter
actual_frame_counter;
int drop_delay;
int drop_pressed_delay;
int drop_delay;
int drop_pressed_delay;
@@
-427,8
+427,10
@@
void GameEnd(void);
void MergeServerScore(void);
void InitPlayerGfxAnimation(struct PlayerInfo *, int, int);
void MergeServerScore(void);
void InitPlayerGfxAnimation(struct PlayerInfo *, int, int);
+
void Moving2Blocked(int, int, int *, int *);
void Blocked2Moving(int, int, int *, int *);
void Moving2Blocked(int, int, int *, int *);
void Blocked2Moving(int, int, int *, int *);
+
void DrawDynamite(int, int);
void StartGameActions(boolean, boolean, int);
void DrawDynamite(int, int);
void StartGameActions(boolean, boolean, int);
@@
-455,9
+457,8
@@
void RaiseScoreElement(int);
void RequestQuitGameExt(boolean, boolean, char *);
void RequestQuitGame(boolean);
void RequestQuitGameExt(boolean, boolean, char *);
void RequestQuitGame(boolean);
-void RequestRestartGame(char *);
-void CheckGameOver(void);
+boolean CheckRestartGame(void);
boolean checkGameSolved(void);
boolean checkGameFailed(void);
boolean checkGameEnded(void);
boolean checkGameSolved(void);
boolean checkGameFailed(void);
boolean checkGameEnded(void);