fixed fading complete screen if playfield viewport has changed

[rocksndiamonds.git] / src / game.h

diff --git a/src/game.h b/src/game.h
index 5d5e887d4857270541ce491bd39c2e3a88128102..34854a773c1426a7b06487489407a8d6eb82a21b 100644 (file)
--- 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
@@ -232,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;
@@ -256,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;
 
@@ -323,6 +338,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;
@@ -382,6 +400,10 @@ 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);
@@ -409,6 +431,9 @@ void UnmapUndoRedoButtons();
 void MapGameButtons();
 void UnmapGameButtons();
 void RedrawGameButtons();
+void MapGameButtonsOnTape();
+void UnmapGameButtonsOnTape();
+void RedrawGameButtonsOnTape();
 
 void HandleSoundButtonKeys(Key);