X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.h;h=89ec940c23a33818c77b5ae80771645f409d4435;hb=de5791c86b3c80e18b1871d39b9ec207c96c7cbf;hp=0851c5400d29e4e1bdf1a134c6c07d1deb398bbc;hpb=b641818c787e48bbf03ce2a0cd5b542c4c21e523;p=rocksndiamonds.git

diff --git a/src/game.h b/src/game.h
index 0851c540..89ec940c 100644
--- a/src/game.h
+++ b/src/game.h
@@ -36,6 +36,11 @@
 #define STR_SNAPSHOT_MODE_EVERY_COLLECT	"every_collect"
 #define STR_SNAPSHOT_MODE_DEFAULT	STR_SNAPSHOT_MODE_OFF
 
+#define STR_SCORES_TYPE_LOCAL_ONLY	 "local_scores_only"
+#define STR_SCORES_TYPE_SERVER_ONLY	 "server_scores_only"
+#define STR_SCORES_TYPE_LOCAL_AND_SERVER "local_and_server_scores"
+#define STR_SCORES_TYPE_DEFAULT		 STR_SCORES_TYPE_LOCAL_AND_SERVER
+
 #define SNAPSHOT_MODE_OFF		0
 #define SNAPSHOT_MODE_EVERY_STEP	1
 #define SNAPSHOT_MODE_EVERY_MOVE	2
@@ -156,6 +161,7 @@ struct GameInfo
   boolean use_native_emc_graphics_engine;
   boolean use_native_sp_graphics_engine;
   boolean use_masked_pushing;
+  boolean use_masked_elements;
   int forced_scroll_delay_value;
   int scroll_delay_value;
   int tile_size;
@@ -198,6 +204,9 @@ struct GameInfo
   boolean envelope_active;
   boolean no_time_limit;	// (variable only in very special case)
 
+  int time_final;		// time (in seconds) or steps left or played
+  int score_time_final;		// time (in frames) or steps played
+
   int score;
   int score_final;
 
@@ -236,6 +245,7 @@ struct GameInfo
 
   // values for special request dialog control
   boolean request_active;
+  boolean request_active_or_moving;
 
   // values for special game control
   int centered_player_nr;
@@ -243,6 +253,9 @@ struct GameInfo
   boolean set_centered_player;
   boolean set_centered_player_wrap;
 
+  // values for single step mode control
+  boolean enter_single_step_mode;
+
   // values for random number generator initialization after snapshot
   unsigned int num_random_calls;
 
@@ -377,6 +390,8 @@ struct PlayerInfo
   int shield_normal_time_left;
   int shield_deadly_time_left;
 
+  int last_removed_element;
+
   int inventory_element[MAX_INVENTORY_SIZE];
   int inventory_infinite_element;
   int inventory_size;
@@ -395,7 +410,7 @@ int GetElementFromGroupElement(int);
 
 int getPlayerInventorySize(int);
 
-void DrawGameValue_Time(int);
+void UpdateGameDoorValues(void);
 void DrawGameDoorValues(void);
 
 void UpdateAndDisplayGameControlValues(void);
@@ -407,6 +422,8 @@ void UpdateEngineValues(int, int, int, int);
 void GameWon(void);
 void GameEnd(void);
 
+void MergeServerScore(void);
+
 void InitPlayerGfxAnimation(struct PlayerInfo *, int, int);
 void Moving2Blocked(int, int, int *, int *);
 void Blocked2Moving(int, int, int *, int *);
@@ -458,8 +475,8 @@ boolean CheckEngineSnapshotList(void);
 
 void CreateGameButtons(void);
 void FreeGameButtons(void);
+void MapLoadSaveButtons(void);
 void MapUndoRedoButtons(void);
-void UnmapUndoRedoButtons(void);
 void ModifyPauseButtons(void);
 void MapGameButtons(void);
 void UnmapGameButtons(void);