void Bang(int, int);
void InitMovDir(int, int);
void InitAmoebaNr(int, int);
-int NewHighScore(int);
+void NewHighScore(int);
void TestIfGoodThingHitsBadThing(int, int, int);
void TestIfBadThingHitsGoodThing(int, int, int);
{
// used instead of "level_nr" (needed for network games)
int last_level_nr = levelset.level_nr;
- int highlight_position;
game.LevelSolved_GameEnd = TRUE;
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)
}
}
- highlight_position = NewHighScore(last_level_nr);
-
- if (highlight_position >= 0 && setup.show_scores_after_game)
+ if (scores.last_added >= 0 && setup.show_scores_after_game)
{
SetGameStatus(GAME_MODE_SCORES);
- DrawHallOfFame(last_level_nr, highlight_position);
+ DrawHallOfFame(last_level_nr);
}
else if (setup.auto_play_next_level && setup.increment_levels &&
last_level_nr < leveldir_current->last_level &&
boolean entry_is_empty = (entry->score == 0 &&
entry->time == 0);
+ // prevent adding server score entries if also existing in local score file
+ if (strEqual(new_entry->tape_basename, entry->tape_basename))
+ return -1;
+
if (is_better || entry_is_empty)
{
// player has made it to the hall of fame
return -1;
}
-int NewHighScore(int level_nr)
+void NewHighScore(int level_nr)
{
struct ScoreEntry new_entry = {{ 0 }}; // (prevent warning from GCC bug 53119)
LoadScore(level_nr);
- int position = addScoreEntry(&scores, &new_entry);
+ scores.last_added = addScoreEntry(&scores, &new_entry);
- if (position >= 0)
+ if (scores.last_added >= 0)
{
- SaveScoreTape(level_nr);
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;
+ }
+}
+
+void MergeServerScore(void)
+{
+ int i;
+
+ for (i = 0; i < server_scores.num_entries; i++)
+ {
+ int pos = addScoreEntry(&scores, &server_scores.entry[i]);
+
+ if (pos >= 0 && pos <= scores.last_added)
+ scores.last_added++;
}
- return position;
+ if (scores.last_added >= MAX_SCORE_ENTRIES)
+ scores.last_added = -1;
}
static int getElementMoveStepsizeExt(int x, int y, int direction)