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 b73d5daff98bef27ac661508e480925a62a15057..3752ba00a7ed37d657bcb9a59b281cf54b9fb86a 100644
(file)
--- a/
src/game.h
+++ b/
src/game.h
@@
-123,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;
@@
-131,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
@@
-163,6
+168,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;
@@
-244,7
+251,6
@@
struct GameInfo
// 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;
@@
-274,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
@@
-424,8
+432,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);