}
}
-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(new_entry->name, EMPTY_PLAYER_NAME))
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)
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;
strncpy(new_entry.tape_basename, tape.score_tape_basename, MAX_FILENAME_LEN);
strncpy(new_entry.name, setup.player_name, MAX_PLAYER_NAME_LEN);
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)
{
void MergeServerScore(void)
{
+ boolean one_per_name = !program.many_scores_per_name;
int i;
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++;