added function to load and merge local and server scores

[rocksndiamonds.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index eb47c4efd0e8c4c7073e5ba5e9a41a95780c894a..1adbfd740c72d7127d35043d538a6014d8123d90 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -8438,6 +8438,7 @@ static void setScoreInfoToDefaultsExt(struct ScoreInfo *scores)
 
   scores->num_entries = 0;
   scores->last_added = -1;
+  scores->last_added_local = -1;
 }
 
 static void setScoreInfoToDefaults(void)
@@ -9052,8 +9053,6 @@ void LoadServerScore(int nr)
 
   DownloadServerScoreToCache(nr);
   LoadServerScoreFromCache(nr);
-
-  MergeServerScore();
 }
 
 static char *get_file_base64(char *filename)
@@ -9196,6 +9195,20 @@ void SaveServerScore(int nr)
   UploadScoreToServer(nr);
 }
 
+void LoadLocalAndServerScore(int nr)
+{
+  int last_added_local = scores.last_added_local;
+
+  LoadScore(nr);
+
+  // restore last added local score entry (before merging server scores)
+  scores.last_added = scores.last_added_local = last_added_local;
+
+  LoadServerScore(nr);
+
+  MergeServerScore();
+}
+
 
 // ============================================================================
 // setup file functions