X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fgame.c;h=83b0c1f3cb94a98767c21573f527dcdaac6ee1c2;hb=7a5e1469c7df6a9f07717f5a9c0e7b8d9a796a2c;hp=8982004f7d5baf11d3a700d75060960f7d17e20a;hpb=5d6032cc9b8eb9c26da60c742b1cc6bec08337cc;p=rocksndiamonds.git

diff --git a/src/game.c b/src/game.c
index 8982004f..83b0c1f3 100644
--- a/src/game.c
+++ b/src/game.c
@@ -4906,6 +4906,27 @@ static void LevelSolved(void)
   LevelSolved_SetFinalGameValues();
 }
 
+static void AdvanceToNextLevel(void)
+{
+  if (setup.increment_levels &&
+      level_nr < leveldir_current->last_level &&
+      !network_playing)
+  {
+    level_nr++;		// advance to next level
+    TapeErase();	// start with empty tape
+
+    if (setup.auto_play_next_level)
+    {
+      scores.continue_playing = TRUE;
+      scores.next_level_nr = level_nr;
+
+      LoadLevel(level_nr);
+
+      SaveLevelSetup_SeriesInfo();
+    }
+  }
+}
+
 void GameWon(void)
 {
   static int time_count_steps;
@@ -5183,23 +5204,8 @@ void GameEnd(void)
   // save score and score tape before potentially erasing tape below
   NewHighScore(last_level_nr, tape_saved);
 
-  if (setup.increment_levels &&
-      level_nr < leveldir_current->last_level &&
-      !network_playing)
-  {
-    level_nr++;		// advance to next level
-    TapeErase();	// start with empty tape
-
-    if (setup.auto_play_next_level)
-    {
-      scores.continue_playing = TRUE;
-      scores.next_level_nr = level_nr;
-
-      LoadLevel(level_nr);
-
-      SaveLevelSetup_SeriesInfo();
-    }
-  }
+  // increment and load next level (if possible and not configured otherwise)
+  AdvanceToNextLevel();
 
   if (scores.last_added >= 0 && setup.show_scores_after_game)
   {