X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.h;h=95531163027886438ca1f202c709e173963b7b16;hb=c118d37bf6ad02e90d4ea7c4a4d7d34d8f745c26;hp=60c80908d8db67dea556c0955dc6ee8fa6d2391c;hpb=3e66c6792cc10afd72877d14eb00d63c3932e872;p=rocksndiamonds.git

diff --git a/src/game.h b/src/game.h
index 60c80908..95531163 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
@@ -157,6 +162,7 @@ struct GameInfo
   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;
@@ -197,7 +203,8 @@ 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
@@ -372,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;
@@ -449,8 +456,8 @@ void RaiseScoreElement(int);
 void RequestQuitGameExt(boolean, boolean, char *);
 void RequestQuitGame(boolean);
 void RequestRestartGame(char *);
-void CheckGameOver(void);
 
+boolean CheckRestartGame(void);
 boolean checkGameSolved(void);
 boolean checkGameFailed(void);
 boolean checkGameEnded(void);