X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fgame.h;h=d31d06951ac9a2d9630426631338ba63c49999c2;hp=65e0375a75e9db07ba9dc6dcc0485c291486deaf;hb=765dcb99ef77ec52dd1e5f0a459ce5ffffcc9cd6;hpb=06128e16cb5b3837d7c436f08f9ccd6ea6f91b8c

diff --git a/src/game.h b/src/game.h
index 65e0375a..d31d0695 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
 
@@ -57,6 +59,9 @@ struct GamePanelInfo
   struct TextPosInfo time_hh;
   struct TextPosInfo time_mm;
   struct TextPosInfo time_ss;
+  struct TextPosInfo time_anim;
+  struct TextPosInfo health;
+  struct TextPosInfo health_anim;
   struct TextPosInfo frame;
   struct TextPosInfo shield_normal;
   struct TextPosInfo shield_normal_time;
@@ -113,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
@@ -141,10 +154,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;
@@ -174,7 +183,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) */
@@ -194,6 +202,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;
@@ -209,6 +220,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 */
@@ -229,6 +242,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,8 +269,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;
 
@@ -320,9 +338,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;
@@ -379,12 +401,17 @@ void ScrollLevel(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 RequestRestartGame(char *);
 
 unsigned int InitEngineRandom_RND(int);
 unsigned int RND(int);
@@ -406,6 +433,9 @@ void UnmapUndoRedoButtons();
 void MapGameButtons();
 void UnmapGameButtons();
 void RedrawGameButtons();
+void MapGameButtonsOnTape();
+void UnmapGameButtonsOnTape();
+void RedrawGameButtonsOnTape();
 
 void HandleSoundButtonKeys(Key);