X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fgame.h;h=3b79cb5d27e4ef817e13d9af119f34842e521d17;hp=5d5e887d4857270541ce491bd39c2e3a88128102;hb=ef4236ac56bedd0e83777505c4ed63fbf4a74698;hpb=4a1cf573aae3a92b4ca910482d425e8b789b32eb

diff --git a/src/game.h b/src/game.h
index 5d5e887d..3b79cb5d 100644
--- a/src/game.h
+++ b/src/game.h
@@ -17,6 +17,8 @@
 
 #define MAX_INVENTORY_SIZE		1000
 
+#define MAX_HEALTH			100
+
 #define STD_NUM_KEYS			4
 #define MAX_NUM_KEYS			8
 
@@ -98,6 +100,9 @@ struct GamePanelInfo
   struct TextPosInfo player_name;
   struct TextPosInfo level_name;
   struct TextPosInfo level_author;
+
+  /* value to determine if panel will be updated or not */
+  boolean active;
 };
 
 struct GameButtonInfo
@@ -116,6 +121,14 @@ struct GameButtonInfo
   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
@@ -144,10 +157,6 @@ struct GameInfo
   int scroll_delay_value;
   int tile_size;
 
-  /* values for engine initialization */
-  int default_push_delay_fixed;
-  int default_push_delay_random;
-
   /* constant within running game */
   int engine_version;
   int emulation;
@@ -177,7 +186,6 @@ struct GameInfo
   int belt_dir_nr[4];
   int switchgate_pos;
   int wind_direction;
-  boolean gravity;
   boolean explosions_delayed;
   boolean envelope_active;
   boolean no_time_limit;	/* (variable only in very special case) */
@@ -197,6 +205,12 @@ struct GameInfo
   /* 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 game control */
   int centered_player_nr;
   int centered_player_nr_next;
@@ -212,6 +226,8 @@ struct GameInfo
 struct PlayerInfo
 {
   boolean present;		/* player present in level playfield */
+  boolean connected_locally;	/* player connected (locally) */
+  boolean connected_network;	/* player connected (network) */
   boolean connected;		/* player connected (locally or via network) */
   boolean active;		/* player present and connected */
   boolean mapped;		/* player already mapped to input device */
@@ -232,6 +248,9 @@ struct PlayerInfo
   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 effective_mouse_action; /* (used by MM engine only) */
+
   int jx, jy, last_jx, last_jy;
   int MovDir, MovPos, GfxDir, GfxPos;
   int Frame, StepFrame;
@@ -253,11 +272,12 @@ struct PlayerInfo
 
   boolean LevelSolved_GameWon;
   boolean LevelSolved_GameEnd;
-  boolean LevelSolved_PanelOff;
   boolean LevelSolved_SaveTape;
   boolean LevelSolved_SaveScore;
+
   int LevelSolved_CountingTime;
   int LevelSolved_CountingScore;
+  int LevelSolved_CountingHealth;
 
   int last_move_dir;
 
@@ -323,9 +343,13 @@ struct PlayerInfo
   int score;
   int score_final;
 
+  int health;
+  int health_final;
+
   int gems_still_needed;
   int sokobanfields_still_needed;
   int lights_still_needed;
+  int players_still_needed;
   int friends_still_needed;
   int key[MAX_NUM_KEYS];
   int num_white_keys;
@@ -343,7 +367,7 @@ extern struct PlayerInfo	stored_player[MAX_PLAYERS], *local_player;
 
 
 #ifdef DEBUG
-void DEBUG_SetMaximumDynamite();
+void DEBUG_SetMaximumDynamite(void);
 #endif
 
 void GetPlayerConfig(void);
@@ -354,10 +378,10 @@ int getPlayerInventorySize(int);
 void DrawGameValue_Time(int);
 void DrawGameDoorValues(void);
 
-void UpdateAndDisplayGameControlValues();
+void UpdateAndDisplayGameControlValues(void);
 
-void InitGameSound();
-void InitGame();
+void InitGameSound(void);
+void InitGame(void);
 
 void UpdateEngineValues(int, int, int, int);
 void GameWon(void);
@@ -371,44 +395,52 @@ void DrawDynamite(int, int);
 void StartGameActions(boolean, boolean, int);
 
 void GameActions(void);
-void GameActions_EM_Main();
-void GameActions_SP_Main();
-void GameActions_MM_Main();
-void GameActions_RND_Main();
-void GameActions_RND();
+void GameActions_EM_Main(void);
+void GameActions_SP_Main(void);
+void GameActions_MM_Main(void);
+void GameActions_RND_Main(void);
+void GameActions_RND(void);
 
 void ScrollLevel(int, int);
 
-void InitPlayLevelSound();
+void InitPlayLevelSound(void);
 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 RequestRestartGame(char *);
 
 unsigned int InitEngineRandom_RND(int);
 unsigned int RND(int);
 
-void FreeEngineSnapshotSingle();
-void FreeEngineSnapshotList();
-void LoadEngineSnapshotSingle();
-void SaveEngineSnapshotSingle();
-boolean CheckSaveEngineSnapshotToList();
-void SaveEngineSnapshotToList();
-void SaveEngineSnapshotToListInitial();
-boolean CheckEngineSnapshotSingle();
-boolean CheckEngineSnapshotList();
-
-void CreateGameButtons();
-void FreeGameButtons();
-void MapUndoRedoButtons();
-void UnmapUndoRedoButtons();
-void MapGameButtons();
-void UnmapGameButtons();
-void RedrawGameButtons();
+void FreeEngineSnapshotSingle(void);
+void FreeEngineSnapshotList(void);
+void LoadEngineSnapshotSingle(void);
+void SaveEngineSnapshotSingle(void);
+boolean CheckSaveEngineSnapshotToList(void);
+void SaveEngineSnapshotToList(void);
+void SaveEngineSnapshotToListInitial(void);
+boolean CheckEngineSnapshotSingle(void);
+boolean CheckEngineSnapshotList(void);
+
+void CreateGameButtons(void);
+void FreeGameButtons(void);
+void MapUndoRedoButtons(void);
+void UnmapUndoRedoButtons(void);
+void MapGameButtons(void);
+void UnmapGameButtons(void);
+void RedrawGameButtons(void);
+void MapGameButtonsOnTape(void);
+void UnmapGameButtonsOnTape(void);
+void RedrawGameButtonsOnTape(void);
 
 void HandleSoundButtonKeys(Key);