projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replaced some info screen positions with already defined symbolic names
[rocksndiamonds.git]
/
src
/
game.h
diff --git
a/src/game.h
b/src/game.h
index 0e87912e25e4c6e42c76b7c975818709fe790ded..93e1d0948fbd3de468f3ad1c870e48da4532106a 100644
(file)
--- a/
src/game.h
+++ b/
src/game.h
@@
-17,6
+17,8
@@
#define MAX_INVENTORY_SIZE 1000
#define MAX_INVENTORY_SIZE 1000
+#define MAX_HEALTH 100
+
#define STD_NUM_KEYS 4
#define MAX_NUM_KEYS 8
#define STD_NUM_KEYS 4
#define MAX_NUM_KEYS 8
@@
-116,6
+118,14
@@
struct GameButtonInfo
struct XY sound_music;
struct XY sound_loops;
struct XY sound_simple;
struct XY sound_music;
struct XY sound_loops;
struct XY sound_simple;
+
+ struct XY panel_stop;
+ struct XY panel_pause;
+ struct XY panel_play;
+
+ struct XY panel_sound_music;
+ struct XY panel_sound_loops;
+ struct XY panel_sound_simple;
};
struct GameSnapshotInfo
};
struct GameSnapshotInfo
@@
-197,6
+207,9
@@
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 game control */
int centered_player_nr;
int centered_player_nr_next;
/* values for special game control */
int centered_player_nr;
int centered_player_nr_next;
@@
-232,7
+245,8
@@
struct PlayerInfo
byte programmed_action; /* action forced by game itself (like moving
through doors); overrides other actions */
byte programmed_action; /* action forced by game itself (like moving
through doors); overrides other actions */
- struct MouseActionInfo mouse_action; /* (used by MM engine only) */
+ struct MouseActionInfo mouse_action; /* (used by MM engine only) */
+ struct MouseActionInfo effective_mouse_action; /* (used by MM engine only) */
int jx, jy, last_jx, last_jy;
int MovDir, MovPos, GfxDir, GfxPos;
int jx, jy, last_jx, last_jy;
int MovDir, MovPos, GfxDir, GfxPos;
@@
-258,8
+272,10
@@
struct PlayerInfo
boolean LevelSolved_PanelOff;
boolean LevelSolved_SaveTape;
boolean LevelSolved_SaveScore;
boolean LevelSolved_PanelOff;
boolean LevelSolved_SaveTape;
boolean LevelSolved_SaveScore;
+
int LevelSolved_CountingTime;
int LevelSolved_CountingScore;
int LevelSolved_CountingTime;
int LevelSolved_CountingScore;
+ int LevelSolved_CountingHealth;
int last_move_dir;
int last_move_dir;
@@
-325,6
+341,9
@@
struct PlayerInfo
int score;
int score_final;
int score;
int score_final;
+ int health;
+ int health_final;
+
int gems_still_needed;
int sokobanfields_still_needed;
int lights_still_needed;
int gems_still_needed;
int sokobanfields_still_needed;
int lights_still_needed;
@@
-384,12
+403,17
@@
void ScrollLevel(int, int);
void InitPlayLevelSound();
void PlayLevelSound_EM(int, int, int, int);
void PlayLevelSound_SP(int, int, int, int);
void InitPlayLevelSound();
void PlayLevelSound_EM(int, int, int, int);
void PlayLevelSound_SP(int, int, int, int);
+void PlayLevelSound_MM(int, int, int, int);
+void PlaySound_MM(int);
+void PlaySoundLoop_MM(int);
+void StopSound_MM(int);
void RaiseScore(int);
void RaiseScoreElement(int);
void RequestQuitGameExt(boolean, boolean, char *);
void RequestQuitGame(boolean);
void RaiseScore(int);
void RaiseScoreElement(int);
void RequestQuitGameExt(boolean, boolean, char *);
void RequestQuitGame(boolean);
+void RequestRestartGame(char *);
unsigned int InitEngineRandom_RND(int);
unsigned int RND(int);
unsigned int InitEngineRandom_RND(int);
unsigned int RND(int);
@@
-411,6
+435,9
@@
void UnmapUndoRedoButtons();
void MapGameButtons();
void UnmapGameButtons();
void RedrawGameButtons();
void MapGameButtons();
void UnmapGameButtons();
void RedrawGameButtons();
+void MapGameButtonsOnTape();
+void UnmapGameButtonsOnTape();
+void RedrawGameButtonsOnTape();
void HandleSoundButtonKeys(Key);
void HandleSoundButtonKeys(Key);