X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.h;h=d65ebd9af24268b575bae380dbaa85d53777edbd;hb=5ef9148d1f605af02e872264519eda261a3e88ca;hp=c6f74f865d36a0179decb5160e100c08ff99a3d2;hpb=457e98ec0803cd9005a522018e7c255454d1e915;p=rocksndiamonds.git

diff --git a/src/game.h b/src/game.h
index c6f74f86..d65ebd9a 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
 
@@ -116,6 +118,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
@@ -197,6 +207,9 @@ 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 game control */
   int centered_player_nr;
   int centered_player_nr_next;
@@ -212,6 +225,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,7 +247,8 @@ 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 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;
@@ -258,8 +274,10 @@ struct PlayerInfo
   boolean LevelSolved_PanelOff;
   boolean LevelSolved_SaveTape;
   boolean LevelSolved_SaveScore;
+
   int LevelSolved_CountingTime;
   int LevelSolved_CountingScore;
+  int LevelSolved_CountingHealth;
 
   int last_move_dir;
 
@@ -325,6 +343,9 @@ struct PlayerInfo
   int score;
   int score_final;
 
+  int health;
+  int health_final;
+
   int gems_still_needed;
   int sokobanfields_still_needed;
   int lights_still_needed;
@@ -394,6 +415,7 @@ void RaiseScoreElement(int);
 
 void RequestQuitGameExt(boolean, boolean, char *);
 void RequestQuitGame(boolean);
+void RequestRestartGame(char *);
 
 unsigned int InitEngineRandom_RND(int);
 unsigned int RND(int);
@@ -415,6 +437,9 @@ void UnmapUndoRedoButtons();
 void MapGameButtons();
 void UnmapGameButtons();
 void RedrawGameButtons();
+void MapGameButtonsOnTape();
+void UnmapGameButtonsOnTape();
+void RedrawGameButtonsOnTape();
 
 void HandleSoundButtonKeys(Key);