moved game controller base mappings file to new 'conf' sub-directory

[rocksndiamonds.git] / src / game.h

diff --git a/src/game.h b/src/game.h
index 3e62cf4d983ece67595577c665f65e67347dafe4..7bf665e821304f10af32db57337eb5561681bb1f 100644 (file)
--- 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
@@ -105,6 +107,7 @@ struct GameButtonInfo
   struct XY redo;
 
   struct XY save;
+  struct XY pause2;
   struct XY load;
 
   struct XY sound_music;
@@ -118,6 +121,9 @@ struct GameSnapshotInfo
 
   byte last_action[MAX_PLAYERS];
   boolean changed_action;
+  boolean collected_item;
+
+  boolean save_snapshot;
 };
 
 struct GameInfo
@@ -127,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;
@@ -267,6 +274,11 @@ struct PlayerInfo
   boolean is_bored;
   boolean is_sleeping;
 
+  boolean was_waiting;
+  boolean was_moving;
+  boolean was_snapping;
+  boolean was_dropping;
+
   boolean cannot_move;
 
   int frame_counter_bored;
@@ -332,6 +344,8 @@ void DEBUG_SetMaximumDynamite();
 void GetPlayerConfig(void);
 int GetElementFromGroupElement(int);
 
+int getPlayerInventorySize(int);
+
 void DrawGameValue_Time(int);
 void DrawGameDoorValues(void);
 
@@ -340,7 +354,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 +368,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);
@@ -375,7 +390,8 @@ void FreeEngineSnapshotSingle();
 void FreeEngineSnapshotList();
 void LoadEngineSnapshotSingle();
 void SaveEngineSnapshotSingle();
-boolean SaveEngineSnapshotToList();
+boolean CheckSaveEngineSnapshotToList();
+void SaveEngineSnapshotToList();
 void SaveEngineSnapshotToListInitial();
 boolean CheckEngineSnapshotSingle();
 boolean CheckEngineSnapshotList();