X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=23fe5f91eae8572a6dc463d56e2392806bf28970;hb=31293fa5f373168828272f461ce38ff70b0a3cb8;hp=de8384e003562d4a2faea5c49122f701a9a67e2a;hpb=59274d67d96fc0b59f572fb8e67879dfd3c2949f;p=rocksndiamonds.git diff --git a/src/game.c b/src/game.c index de8384e0..23fe5f91 100644 --- a/src/game.c +++ b/src/game.c @@ -1106,7 +1106,7 @@ void ContinueMoving(int, int); void Bang(int, int); void InitMovDir(int, int); void InitAmoebaNr(int, int); -int NewHiScore(int); +void NewHighScore(int); void TestIfGoodThingHitsBadThing(int, int, int); void TestIfBadThingHitsGoodThing(int, int, int); @@ -4960,7 +4960,6 @@ void GameEnd(void) { // used instead of "level_nr" (needed for network games) int last_level_nr = levelset.level_nr; - int hi_pos; game.LevelSolved_GameEnd = TRUE; @@ -5004,6 +5003,9 @@ void GameEnd(void) SaveLevelSetup_SeriesInfo(); } + // save score and score tape before potentially erasing tape below + NewHighScore(last_level_nr); + if (setup.increment_levels && level_nr < leveldir_current->last_level && !network_playing) @@ -5019,13 +5021,11 @@ void GameEnd(void) } } - hi_pos = NewHiScore(last_level_nr); - - if (hi_pos >= 0 && setup.show_scores_after_game) + if (scores.last_added >= 0 && setup.show_scores_after_game) { SetGameStatus(GAME_MODE_SCORES); - DrawHallOfFame(last_level_nr, hi_pos); + DrawHallOfFame(last_level_nr); } else if (setup.auto_play_next_level && setup.increment_levels && last_level_nr < leveldir_current->last_level && @@ -5041,25 +5041,21 @@ void GameEnd(void) } } -int NewHiScore(int level_nr) +static int addScoreEntry(struct ScoreInfo *list, struct ScoreEntry *new_entry, + boolean one_score_entry_per_name) { - int i, l; - int position = -1; - boolean one_score_entry_per_name = !program.many_scores_per_name; - - LoadScore(level_nr); + int i; - if (strEqual(setup.player_name, EMPTY_PLAYER_NAME) || - game.score_final < scores.entry[MAX_SCORE_ENTRIES - 1].score) + if (strEqual(new_entry->name, EMPTY_PLAYER_NAME)) return -1; for (i = 0; i < MAX_SCORE_ENTRIES; i++) { - struct ScoreEntry *entry = &scores.entry[i]; - boolean score_is_better = (game.score_final > entry->score); - boolean score_is_equal = (game.score_final == entry->score); - boolean time_is_better = (game.score_time_final < entry->time); - boolean time_is_equal = (game.score_time_final == entry->time); + struct ScoreEntry *entry = &list->entry[i]; + boolean score_is_better = (new_entry->score > entry->score); + boolean score_is_equal = (new_entry->score == entry->score); + boolean time_is_better = (new_entry->time < entry->time); + boolean time_is_equal = (new_entry->time == entry->time); boolean better_by_score = (score_is_better || (score_is_equal && time_is_better)); boolean better_by_time = (time_is_better || @@ -5069,6 +5065,12 @@ int NewHiScore(int level_nr) boolean entry_is_empty = (entry->score == 0 && entry->time == 0); + // prevent adding server score entries if also existing in local score file + // (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) { // player has made it to the hall of fame @@ -5076,11 +5078,12 @@ int NewHiScore(int level_nr) if (i < MAX_SCORE_ENTRIES - 1) { int m = MAX_SCORE_ENTRIES - 1; + int l; if (one_score_entry_per_name) { for (l = i; l < MAX_SCORE_ENTRIES; l++) - if (strEqual(setup.player_name, scores.entry[l].name)) + if (strEqual(list->entry[l].name, new_entry->name)) m = l; if (m == i) // player's new highscore overwrites his old one @@ -5088,36 +5091,81 @@ int NewHiScore(int level_nr) } for (l = m; l > i; l--) - { - strcpy(scores.entry[l].name, scores.entry[l - 1].name); - scores.entry[l].score = scores.entry[l - 1].score; - scores.entry[l].time = scores.entry[l - 1].time; - } + list->entry[l] = list->entry[l - 1]; } put_into_list: - strcpy(entry->tape_basename, tape.score_tape_basename); - strncpy(entry->name, setup.player_name, MAX_PLAYER_NAME_LEN); - entry->name[MAX_PLAYER_NAME_LEN] = '\0'; - entry->score = game.score_final; - entry->time = game.score_time_final; - position = i; + *entry = *new_entry; - break; + return i; } else if (one_score_entry_per_name && - !strncmp(setup.player_name, entry->name, MAX_PLAYER_NAME_LEN)) - break; // player already there with a higher score + strEqual(entry->name, new_entry->name)) + { + // player already in high score list with better score or time + + return -1; + } + } + + return -1; +} + +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); + + new_entry.score = game.score_final; + new_entry.time = game.score_time_final; + + LoadScore(level_nr); + + scores.last_added = addScoreEntry(&scores, &new_entry, one_per_name); + + if (scores.last_added >= 0) + { + SaveScore(level_nr); + + // store last added local score entry (before merging server scores) + scores.last_added_local = scores.last_added; } - if (position >= 0) + if (game.LevelSolved_SaveTape) { SaveScoreTape(level_nr); - SaveScore(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], one_per_name); + + if (pos >= 0 && pos <= scores.last_added) + scores.last_added++; } - return position; + if (scores.last_added >= MAX_SCORE_ENTRIES) + { + 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)