X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=f6b479efdfb6c152ac472695606977746681872e;hb=eb1e4bd8531feb5811336d6a993cb5a3575bcdf2;hp=c1af86314e0a12c979d32a8efac9f0488d844026;hpb=b55729ffeba9da45b5ae83abfd3460a5c0609e94;p=rocksndiamonds.git

diff --git a/src/game.c b/src/game.c
index c1af8631..f6b479ef 100644
--- a/src/game.c
+++ b/src/game.c
@@ -4721,9 +4721,6 @@ void GameWon(void)
   static int game_over_delay_1 = 0;
   static int game_over_delay_2 = 0;
   static int game_over_delay_3 = 0;
-  int game_over_delay_value_1 = 50;
-  int game_over_delay_value_2 = 25;
-  int game_over_delay_value_3 = 50;
   int time_score_base = MIN(MAX(1, level.time_score_base), 10);
   float time_score = (float)level.score[SC_TIME_BONUS] / time_score_base;
 
@@ -4751,9 +4748,9 @@ void GameWon(void)
 
     TapeStop();
 
-    game_over_delay_1 = 0;
-    game_over_delay_2 = 0;
-    game_over_delay_3 = game_over_delay_value_3;
+    game_over_delay_1 = FRAMES_PER_SECOND;	// delay before counting time
+    game_over_delay_2 = FRAMES_PER_SECOND / 2;	// delay before counting health
+    game_over_delay_3 = FRAMES_PER_SECOND;	// delay before ending the game
 
     time = time_final = (game.no_time_limit ? TimePlayed : TimeLeft);
     score = score_final = game.score_final;
@@ -4778,14 +4775,10 @@ void GameWon(void)
 
       time_count_steps = MAX(1, ABS(time_final - time) / 100);
 
-      game_over_delay_1 = game_over_delay_value_1;
-
       if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
       {
 	health_final = 0;
 	score_final += health * time_score;
-
-	game_over_delay_2 = game_over_delay_value_2;
       }
 
       game.score_final = score_final;
@@ -4858,15 +4851,15 @@ void GameWon(void)
 
   if (setup.count_score_after_game)
   {
-    if (game_over_delay_1 > 0)
+    if (time != time_final)
     {
-      game_over_delay_1--;
+      if (game_over_delay_1 > 0)
+      {
+	game_over_delay_1--;
 
-      return;
-    }
+	return;
+      }
 
-    if (time != time_final)
-    {
       int time_to_go = ABS(time_final - time);
       int time_count_dir = (time < time_final ? +1 : -1);
 
@@ -4898,15 +4891,15 @@ void GameWon(void)
       return;
     }
 
-    if (game_over_delay_2 > 0)
+    if (health != health_final)
     {
-      game_over_delay_2--;
+      if (game_over_delay_2 > 0)
+      {
+	game_over_delay_2--;
 
-      return;
-    }
+	return;
+      }
 
-    if (health != health_final)
-    {
       int health_count_dir = (health < health_final ? +1 : -1);
 
       health += health_count_dir;