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

diff --git a/src/game.h b/src/game.h
index e334dcc6..c6f74f86 100644
--- a/src/game.h
+++ b/src/game.h
@@ -31,12 +31,14 @@
 #define STR_SNAPSHOT_MODE_OFF		"off"
 #define STR_SNAPSHOT_MODE_EVERY_STEP	"every_step"
 #define STR_SNAPSHOT_MODE_EVERY_MOVE	"every_move"
-#define STR_SNAPSHOT_MODE_DEFAULT	STR_SNAPSHOT_MODE_EVERY_MOVE
+#define STR_SNAPSHOT_MODE_EVERY_COLLECT	"every_collect"
+#define STR_SNAPSHOT_MODE_DEFAULT	STR_SNAPSHOT_MODE_OFF
 
 #define SNAPSHOT_MODE_OFF		0
 #define SNAPSHOT_MODE_EVERY_STEP	1
 #define SNAPSHOT_MODE_EVERY_MOVE	2
-#define SNAPSHOT_MODE_DEFAULT		SNAPSHOT_MODE_EVERY_MOVE
+#define SNAPSHOT_MODE_EVERY_COLLECT	3
+#define SNAPSHOT_MODE_DEFAULT		SNAPSHOT_MODE_OFF
 
 
 struct GamePanelInfo
@@ -55,6 +57,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;
@@ -105,6 +110,7 @@ struct GameButtonInfo
   struct XY redo;
 
   struct XY save;
+  struct XY pause2;
   struct XY load;
 
   struct XY sound_music;
@@ -118,6 +124,9 @@ struct GameSnapshotInfo
 
   byte last_action[MAX_PLAYERS];
   boolean changed_action;
+  boolean collected_item;
+
+  boolean save_snapshot;
 };
 
 struct GameInfo
@@ -127,6 +136,7 @@ struct GameInfo
   struct GameButtonInfo button;
 
   /* values for graphics engine customization */
+  int graphics_engine_version;
   boolean use_native_emc_graphics_engine;
   boolean use_native_sp_graphics_engine;
   boolean use_masked_pushing;
@@ -222,6 +232,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) */
+
   int jx, jy, last_jx, last_jy;
   int MovDir, MovPos, GfxDir, GfxPos;
   int Frame, StepFrame;
@@ -267,8 +279,15 @@ struct PlayerInfo
   boolean is_bored;
   boolean is_sleeping;
 
+  boolean was_waiting;
+  boolean was_moving;
+  boolean was_snapping;
+  boolean was_dropping;
+
   boolean cannot_move;
 
+  boolean force_dropping;	/* needed for single step mode */
+
   int frame_counter_bored;
   int frame_counter_sleeping;
 
@@ -332,6 +351,8 @@ void DEBUG_SetMaximumDynamite();
 void GetPlayerConfig(void);
 int GetElementFromGroupElement(int);
 
+int getPlayerInventorySize(int);
+
 void DrawGameValue_Time(int);
 void DrawGameDoorValues(void);
 
@@ -340,7 +361,7 @@ void UpdateAndDisplayGameControlValues();
 void InitGameSound();
 void InitGame();
 
-void UpdateEngineValues(int, int);
+void UpdateEngineValues(int, int, int, int);
 void GameWon(void);
 void GameEnd(void);
 
@@ -354,6 +375,8 @@ 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 ScrollLevel(int, int);
@@ -361,6 +384,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);
@@ -375,13 +402,16 @@ void FreeEngineSnapshotSingle();
 void FreeEngineSnapshotList();
 void LoadEngineSnapshotSingle();
 void SaveEngineSnapshotSingle();
-boolean SaveEngineSnapshotToList();
+boolean CheckSaveEngineSnapshotToList();
+void SaveEngineSnapshotToList();
+void SaveEngineSnapshotToListInitial();
 boolean CheckEngineSnapshotSingle();
+boolean CheckEngineSnapshotList();
 
 void CreateGameButtons();
 void FreeGameButtons();
-void MapStopPlayButtons();
 void MapUndoRedoButtons();
+void UnmapUndoRedoButtons();
 void MapGameButtons();
 void UnmapGameButtons();
 void RedrawGameButtons();