X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=23fe5f91eae8572a6dc463d56e2392806bf28970;hb=31293fa5f373168828272f461ce38ff70b0a3cb8;hp=70aa13f400166aa87d9ba9c06801675f11a78cc8;hpb=07158159ab00f9fbbd3591a692370933cd1bc418;p=rocksndiamonds.git

diff --git a/src/game.c b/src/game.c
index 70aa13f4..23fe5f91 100644
--- a/src/game.c
+++ b/src/game.c
@@ -5115,7 +5115,7 @@ static int addScoreEntry(struct ScoreInfo *list, struct ScoreEntry *new_entry,
 void NewHighScore(int level_nr)
 {
   struct ScoreEntry new_entry = {{ 0 }}; // (prevent warning from GCC bug 53119)
-  boolean one_per_name = !program.many_scores_per_name;
+  boolean one_per_name = FALSE;
 
   strncpy(new_entry.tape_basename, tape.score_tape_basename, MAX_FILENAME_LEN);
   strncpy(new_entry.name, setup.player_name, MAX_PLAYER_NAME_LEN);
@@ -5131,22 +5131,26 @@ void NewHighScore(int level_nr)
   {
     SaveScore(level_nr);
 
-    if (game.LevelSolved_SaveTape)
-    {
-      SaveScoreTape(level_nr);
-      SaveServerScore(level_nr);
-    }
-
     // store last added local score entry (before merging server scores)
     scores.last_added_local = scores.last_added;
   }
+
+  if (game.LevelSolved_SaveTape)
+  {
+    SaveScoreTape(level_nr);
+    SaveServerScore(level_nr);
+  }
 }
 
 void MergeServerScore(void)
 {
-  boolean one_per_name = !program.many_scores_per_name;
+  struct ScoreEntry last_added_entry;
+  boolean one_per_name = FALSE;
   int i;
 
+  if (scores.last_added >= 0)
+    last_added_entry = scores.entry[scores.last_added];
+
   for (i = 0; i < server_scores.num_entries; i++)
   {
     int pos = addScoreEntry(&scores, &server_scores.entry[i], one_per_name);
@@ -5156,7 +5160,12 @@ void MergeServerScore(void)
   }
 
   if (scores.last_added >= MAX_SCORE_ENTRIES)
-    scores.last_added = -1;
+  {
+    scores.last_added = MAX_SCORE_ENTRIES - 1;
+    scores.force_last_added = TRUE;
+
+    scores.entry[scores.last_added] = last_added_entry;
+  }
 }
 
 static int getElementMoveStepsizeExt(int x, int y, int direction)