X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=23fe5f91eae8572a6dc463d56e2392806bf28970;hb=a4e95e0a6d4b53732ea0a585be0b6df55ae41e42;hp=7ce53c5b077581d92118638e15ff81da1a0dfc2f;hpb=943e766434e3043be25c8c11f5aa968304f5164f;p=rocksndiamonds.git

diff --git a/src/game.c b/src/game.c
index 7ce53c5b..23fe5f91 100644
--- a/src/game.c
+++ b/src/game.c
@@ -5025,7 +5025,7 @@ void GameEnd(void)
   {
     SetGameStatus(GAME_MODE_SCORES);
 
-    DrawHallOfFame(last_level_nr, scores.last_added);
+    DrawHallOfFame(last_level_nr);
   }
   else if (setup.auto_play_next_level && setup.increment_levels &&
 	   last_level_nr < leveldir_current->last_level &&
@@ -5041,12 +5041,12 @@ void GameEnd(void)
   }
 }
 
-static int addScoreEntry(struct ScoreInfo *list, struct ScoreEntry *new_entry)
+static int addScoreEntry(struct ScoreInfo *list, struct ScoreEntry *new_entry,
+			 boolean one_score_entry_per_name)
 {
-  boolean one_score_entry_per_name = !program.many_scores_per_name;
   int i;
 
-  if (strEqual(setup.player_name, EMPTY_PLAYER_NAME))
+  if (strEqual(new_entry->name, EMPTY_PLAYER_NAME))
     return -1;
 
   for (i = 0; i < MAX_SCORE_ENTRIES; i++)
@@ -5066,7 +5066,9 @@ static int addScoreEntry(struct ScoreInfo *list, struct ScoreEntry *new_entry)
 			      entry->time == 0);
 
     // prevent adding server score entries if also existing in local score file
-    if (strEqual(new_entry->tape_basename, entry->tape_basename))
+    // (special case: historic score entries have an empty tape basename entry)
+    if (strEqual(new_entry->tape_basename, entry->tape_basename) &&
+	!strEqual(new_entry->tape_basename, UNDEFINED_FILENAME))
       return -1;
 
     if (is_better || entry_is_empty)
@@ -5081,7 +5083,7 @@ static int addScoreEntry(struct ScoreInfo *list, struct ScoreEntry *new_entry)
 	if (one_score_entry_per_name)
 	{
 	  for (l = i; l < MAX_SCORE_ENTRIES; l++)
-	    if (strEqual(list->entry[l].name, setup.player_name))
+	    if (strEqual(list->entry[l].name, new_entry->name))
 	      m = l;
 
 	  if (m == i)	// player's new highscore overwrites his old one
@@ -5099,7 +5101,7 @@ static int addScoreEntry(struct ScoreInfo *list, struct ScoreEntry *new_entry)
       return i;
     }
     else if (one_score_entry_per_name &&
-	     strEqual(entry->name, setup.player_name))
+	     strEqual(entry->name, new_entry->name))
     {
       // player already in high score list with better score or time
 
@@ -5113,6 +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 = FALSE;
 
   strncpy(new_entry.tape_basename, tape.score_tape_basename, MAX_FILENAME_LEN);
   strncpy(new_entry.name, setup.player_name, MAX_PLAYER_NAME_LEN);
@@ -5122,34 +5125,47 @@ void NewHighScore(int level_nr)
 
   LoadScore(level_nr);
 
-  scores.last_added = addScoreEntry(&scores, &new_entry);
+  scores.last_added = addScoreEntry(&scores, &new_entry, one_per_name);
 
   if (scores.last_added >= 0)
   {
     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)
 {
+  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]);
+    int pos = addScoreEntry(&scores, &server_scores.entry[i], one_per_name);
 
     if (pos >= 0 && pos <= scores.last_added)
       scores.last_added++;
   }
 
   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)