moved requesting game restart to function that checks for game over

[rocksndiamonds.git] / src / game.h

diff --git a/src/game.h b/src/game.h
index 94144e3ee098210028344015c60bab38432b8e5e..95531163027886438ca1f202c709e173963b7b16 100644 (file)
--- a/src/game.h
+++ b/src/game.h
@@ -203,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
@@ -378,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;
@@ -455,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);