X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fgame.h;h=70df8a252b0b8de56d3a045a5aa31593710e8963;hp=ae0a1cc19ec93bfe4da257cec54d1ce30af1be61;hb=47da774c66f9325f9d27cddb5a697514154e2de9;hpb=686d4883428879e2e882222a6579e376d9e4ac4c

diff --git a/src/game.h b/src/game.h
index ae0a1cc1..70df8a25 100644
--- a/src/game.h
+++ b/src/game.h
@@ -15,21 +15,30 @@
 /* (not included here due to collisions with Emerald Mine engine definitions) */
 /* #include "main.h" */
 
-#define MAX_INVENTORY_SIZE	1000
+#define MAX_INVENTORY_SIZE		1000
 
-#define STD_NUM_KEYS		4
-#define MAX_NUM_KEYS		8
+#define STD_NUM_KEYS			4
+#define MAX_NUM_KEYS			8
 
-#define NUM_BELTS		4
-#define NUM_BELT_PARTS		3
+#define NUM_BELTS			4
+#define NUM_BELT_PARTS			3
 
-#define NUM_PANEL_INVENTORY	8
-#define NUM_PANEL_GRAPHICS	8
-#define NUM_PANEL_ELEMENTS	8
-#define NUM_PANEL_CE_SCORE	8
+#define NUM_PANEL_INVENTORY		8
+#define NUM_PANEL_GRAPHICS		8
+#define NUM_PANEL_ELEMENTS		8
+#define NUM_PANEL_CE_SCORE		8
 
-#define SNAPSHOT_MODE_STEP	0
-#define SNAPSHOT_MODE_MOVE	1
+#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_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_EVERY_COLLECT	3
+#define SNAPSHOT_MODE_DEFAULT		SNAPSHOT_MODE_OFF
 
 
 struct GamePanelInfo
@@ -98,6 +107,7 @@ struct GameButtonInfo
   struct XY redo;
 
   struct XY save;
+  struct XY pause2;
   struct XY load;
 
   struct XY sound_music;
@@ -111,6 +121,9 @@ struct GameSnapshotInfo
 
   byte last_action[MAX_PLAYERS];
   boolean changed_action;
+  boolean collected_item;
+
+  boolean save_snapshot;
 };
 
 struct GameInfo
@@ -120,6 +133,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;
@@ -260,8 +274,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;
 
@@ -325,6 +346,8 @@ void DEBUG_SetMaximumDynamite();
 void GetPlayerConfig(void);
 int GetElementFromGroupElement(int);
 
+int getPlayerInventorySize(int);
+
 void DrawGameValue_Time(int);
 void DrawGameDoorValues(void);
 
@@ -333,7 +356,7 @@ void UpdateAndDisplayGameControlValues();
 void InitGameSound();
 void InitGame();
 
-void UpdateEngineValues(int, int);
+void UpdateEngineValues(int, int, int, int);
 void GameWon(void);
 void GameEnd(void);
 
@@ -347,6 +370,7 @@ void StartGameActions(boolean, boolean, int);
 void GameActions(void);
 void GameActions_EM_Main();
 void GameActions_SP_Main();
+void GameActions_RND_Main();
 void GameActions_RND();
 
 void ScrollLevel(int, int);
@@ -368,13 +392,16 @@ void FreeEngineSnapshotSingle();
 void FreeEngineSnapshotList();
 void LoadEngineSnapshotSingle();
 void SaveEngineSnapshotSingle();
-boolean SaveEngineSnapshotToList();
-boolean CheckEngineSnapshot();
+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();