added overwriting local with server score entries to add missing fields

[rocksndiamonds.git] / src / game.c

diff --git a/src/game.c b/src/game.c
index 4b7533ad779cabe27e85c770da5dae961eaf2378..d7b6ad3d164a7799ecb87671b5272ceb0274797d 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -5116,10 +5116,11 @@ static int addScoreEntry(struct ScoreInfo *list, struct ScoreEntry *new_entry,
     if (strEqual(new_entry->tape_basename, entry->tape_basename) &&
        !strEqual(new_entry->tape_basename, UNDEFINED_FILENAME))
     {
     if (strEqual(new_entry->tape_basename, entry->tape_basename) &&
        !strEqual(new_entry->tape_basename, UNDEFINED_FILENAME))
     {

-      // special case: use server score instead of local score value if higher
-      // (historic scores might have been truncated to 16-bit values locally)
-      if (score_is_better)
-       entry->score = new_entry->score;
+      // add fields from server score entry not stored in local score entry
+      // (currently, this means setting platform, version and country fields;
+      // in rare cases, this may also correct an invalid score value, as
+      // historic scores might have been truncated to 16-bit values locally)
+      *entry = *new_entry;

 
       return -1;
     }
 
       return -1;
     }