X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.h;h=656bb396083890e739304799e23fdc5ed63e0243;hb=refs%2Fheads%2Fmaster-next-patch-release;hp=a4b1b0c5951e11bf8e8f55e67b60c83dca41882c;hpb=320d4a2e79c5562cc55d83927e0ac4d05080ccb4;p=rocksndiamonds.git

diff --git a/src/game.h b/src/game.h
index a4b1b0c5..26c186fe 100644
--- a/src/game.h
+++ b/src/game.h
@@ -4,7 +4,7 @@
 // (c) 1995-2014 by Artsoft Entertainment
 //     		    Holger Schemel
 //		    info@artsoft.org
-//		    http://www.artsoft.org/
+//		    https://www.artsoft.org/
 // ----------------------------------------------------------------------------
 // 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,8 @@ struct GameInfo
   boolean use_native_emc_graphics_engine;
   boolean use_native_sp_graphics_engine;
   boolean use_masked_pushing;
+  boolean use_masked_elements;
+  boolean use_masked_elements_initial;
   int forced_scroll_delay_value;
   int scroll_delay_value;
   int tile_size;
@@ -178,6 +185,10 @@ struct GameInfo
   boolean max_num_changes_per_frame;
   boolean use_reverse_scan_direction;
 
+  // flags to indicate which game actions are used in this game
+  boolean use_key_actions;
+  boolean use_mouse_actions;
+
   // variable within running game
   int yamyam_content_nr;
   boolean robot_wheel_active;
@@ -192,7 +203,11 @@ struct GameInfo
 
   boolean explosions_delayed;
   boolean envelope_active;
-  boolean no_time_limit;	// (variable only in very special case)
+  boolean no_level_time_limit;	// (variable only in very special case)
+  boolean time_limit;		// forced by levelset config or setup option
+
+  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;
@@ -215,7 +230,7 @@ struct GameInfo
   // values for the new EMC elements
   int lenses_time_left;
   int magnify_time_left;
-  boolean ball_state;
+  boolean ball_active;
   int ball_content_nr;
 
   // values for player idle animation (no effect on engine)
@@ -232,12 +247,16 @@ 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;
   int centered_player_nr_next;
   boolean set_centered_player;
-  boolean set_centered_player_fast;
+  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;
@@ -360,7 +379,7 @@ struct PlayerInfo
   int push_delay;
   int push_delay_value;
 
-  unsigned int actual_frame_counter;
+  DelayCounter actual_frame_counter;
 
   int drop_delay;
   int drop_pressed_delay;
@@ -373,6 +392,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;
@@ -391,7 +412,7 @@ int GetElementFromGroupElement(int);
 
 int getPlayerInventorySize(int);
 
-void DrawGameValue_Time(int);
+void UpdateGameDoorValues(void);
 void DrawGameDoorValues(void);
 
 void UpdateAndDisplayGameControlValues(void);
@@ -403,6 +424,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 *);
@@ -454,8 +477,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);