projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added optional button to restart game (door, panel and touch variants)
[rocksndiamonds.git]
/
src
/
game.h
diff --git
a/src/game.h
b/src/game.h
index 13bfdbc10000f13be3ae08863bee87e6b3b13b17..3752ba00a7ed37d657bcb9a59b281cf54b9fb86a 100644
(file)
--- a/
src/game.h
+++ b/
src/game.h
@@
-36,6
+36,11
@@
#define STR_SNAPSHOT_MODE_EVERY_COLLECT "every_collect"
#define STR_SNAPSHOT_MODE_DEFAULT STR_SNAPSHOT_MODE_OFF
#define STR_SNAPSHOT_MODE_EVERY_COLLECT "every_collect"
#define STR_SNAPSHOT_MODE_DEFAULT STR_SNAPSHOT_MODE_OFF
+#define STR_SCORES_TYPE_LOCAL_ONLY "local_scores_only"
+#define STR_SCORES_TYPE_SERVER_ONLY "server_scores_only"
+#define STR_SCORES_TYPE_LOCAL_AND_SERVER "local_and_server_scores"
+#define STR_SCORES_TYPE_DEFAULT STR_SCORES_TYPE_LOCAL_AND_SERVER
+
#define SNAPSHOT_MODE_OFF 0
#define SNAPSHOT_MODE_EVERY_STEP 1
#define SNAPSHOT_MODE_EVERY_MOVE 2
#define SNAPSHOT_MODE_OFF 0
#define SNAPSHOT_MODE_EVERY_STEP 1
#define SNAPSHOT_MODE_EVERY_MOVE 2
@@
-118,6
+123,8
@@
struct GameButtonInfo
struct XY pause2;
struct XY load;
struct XY pause2;
struct XY load;
+ struct XY restart;
+
struct XY sound_music;
struct XY sound_loops;
struct XY sound_simple;
struct XY sound_music;
struct XY sound_loops;
struct XY sound_simple;
@@
-126,12
+133,15
@@
struct GameButtonInfo
struct XY panel_pause;
struct XY panel_play;
struct XY panel_pause;
struct XY panel_play;
+ struct XY panel_restart;
+
struct XY panel_sound_music;
struct XY panel_sound_loops;
struct XY panel_sound_simple;
struct XY touch_stop;
struct XY touch_pause;
struct XY panel_sound_music;
struct XY panel_sound_loops;
struct XY panel_sound_simple;
struct XY touch_stop;
struct XY touch_pause;
+ struct XY touch_restart;
};
struct GameSnapshotInfo
};
struct GameSnapshotInfo
@@
-157,6
+167,9
@@
struct GameInfo
boolean use_native_sp_graphics_engine;
boolean use_masked_pushing;
boolean use_masked_elements;
boolean use_native_sp_graphics_engine;
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;
@@
-197,7
+210,8
@@
struct GameInfo
boolean explosions_delayed;
boolean envelope_active;
boolean explosions_delayed;
boolean envelope_active;
- boolean no_time_limit; // (variable only in very special case)
+ boolean no_level_time_limit; // (variable only in very special case)
+ 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
@@
-235,12
+249,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;
@@
-270,6
+280,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
@@
-372,7
+384,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;
@@
-417,9
+429,13
@@
void UpdateEngineValues(int, int, int, int);
void GameWon(void);
void GameEnd(void);
void GameWon(void);
void GameEnd(void);
+void MergeServerScore(void);
+
void InitPlayerGfxAnimation(struct PlayerInfo *, int, int);
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);
@@
-446,9
+462,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);
@@
-468,8
+483,8
@@
boolean CheckEngineSnapshotList(void);
void CreateGameButtons(void);
void FreeGameButtons(void);
void CreateGameButtons(void);
void FreeGameButtons(void);
+void MapLoadSaveButtons(void);
void MapUndoRedoButtons(void);
void MapUndoRedoButtons(void);
-void UnmapUndoRedoButtons(void);
void ModifyPauseButtons(void);
void MapGameButtons(void);
void UnmapGameButtons(void);
void ModifyPauseButtons(void);
void MapGameButtons(void);
void UnmapGameButtons(void);