fixed checking player name when adding new score entry

[rocksndiamonds.git] / src / game.c

diff --git a/src/game.c b/src/game.c
index f783c164f8f0187e3bf438c03a8562332121410d..6d5cf55307e91f756000f5a71c101ee3be496972 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -5046,7 +5046,7 @@ static int addScoreEntry(struct ScoreInfo *list, struct ScoreEntry *new_entry)
   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++)
@@ -5081,7 +5081,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 +5099,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
 
@@ -5133,6 +5133,9 @@ void NewHighScore(int level_nr)
       SaveScoreTape(level_nr);
       SaveServerScore(level_nr);
     }
+
+    // store last added local score entry (before merging server scores)
+    scores.last_added_local = scores.last_added;
   }
 }