added asking before uploading scores and tapes for the first time

[rocksndiamonds.git] / src / game.c

diff --git a/src/game.c b/src/game.c
index 89e9e7fac1c739df6326eb4276d28913d6794795..d4cc5ea8e0c5572bb737e62cb9202bdad128b344 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -5134,19 +5134,37 @@ void NewHighScore(int level_nr, boolean tape_saved)
 
   scores.last_added = addScoreEntry(&scores, &new_entry, one_per_name);
 
-  if (scores.last_added >= 0)
-  {
-    SaveScore(level_nr);
+  if (scores.last_added < 0)
+    return;
 
-    // store last added local score entry (before merging server scores)
-    scores.last_added_local = scores.last_added;
-  }
+  SaveScore(level_nr);
 
-  if (game.LevelSolved_SaveTape)
+  // store last added local score entry (before merging server scores)
+  scores.last_added_local = scores.last_added;
+
+  if (!game.LevelSolved_SaveTape)
+    return;
+
+  SaveScoreTape(level_nr);
+
+  if (setup.ask_for_using_api_server)
   {
-    SaveScoreTape(level_nr);
-    SaveServerScore(level_nr, tape_saved);
+    setup.use_api_server =
+      Request("Upload your score and tape to the high score server?", REQ_ASK);
+
+    if (!setup.use_api_server)
+      Request("Not using high score server! Use setup menu to enable again!",
+             REQ_CONFIRM);
+
+    runtime.use_api_server = setup.use_api_server;
+
+    // after asking for using API server once, do not ask again
+    setup.ask_for_using_api_server = FALSE;
+
+    SaveSetup_ServerSetup();
   }
+
+  SaveServerScore(level_nr, tape_saved);
 }
 
 void MergeServerScore(void)
@@ -11713,7 +11731,7 @@ static void GameActionsExt(void)
     Warn("element '%s' caused endless loop in game engine",
         EL_NAME(recursion_loop_element));
 
-    RequestQuitGameExt(FALSE, level_editor_test_game, message);
+    RequestQuitGameExt(program.headless, level_editor_test_game, message);
 
     recursion_loop_detected = FALSE;   // if game should be continued