X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=470ccf5901defd4fe9407207f80a4309e48a7695;hb=e4b2e4f943c20af98956d30fd3014888e9f75416;hp=5a88750f40b867bf3a08459b40dd05a6b99aa7e9;hpb=50d7e364e74fbdd3e1a25a86613742c0f3867739;p=rocksndiamonds.git

diff --git a/src/game.c b/src/game.c
index 5a88750f..470ccf59 100644
--- a/src/game.c
+++ b/src/game.c
@@ -5004,6 +5004,9 @@ void GameEnd(void)
     SaveLevelSetup_SeriesInfo();
   }
 
+  // save score and score tape before potentially erasing tape below
+  highlight_position = NewHighScore(last_level_nr);
+
   if (setup.increment_levels &&
       level_nr < leveldir_current->last_level &&
       !network_playing)
@@ -5019,8 +5022,6 @@ void GameEnd(void)
     }
   }
 
-  highlight_position = NewHighScore(last_level_nr);
-
   if (highlight_position >= 0 && setup.show_scores_after_game)
   {
     SetGameStatus(GAME_MODE_SCORES);
@@ -5041,25 +5042,21 @@ void GameEnd(void)
   }
 }
 
-int NewHighScore(int level_nr)
+static int addScoreEntry(struct ScoreInfo *list, struct ScoreEntry *new_entry)
 {
-  int i, l;
-  int position = -1;
   boolean one_score_entry_per_name = !program.many_scores_per_name;
+  int i;
 
-  LoadScore(level_nr);
-
-  if (strEqual(setup.player_name, EMPTY_PLAYER_NAME) ||
-      game.score_final < scores.entry[MAX_SCORE_ENTRIES - 1].score)
+  if (strEqual(setup.player_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 +5066,10 @@ int NewHighScore(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
+    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
@@ -5076,11 +5077,12 @@ int NewHighScore(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, setup.player_name))
 	      m = l;
 
 	  if (m == i)	// player's new highscore overwrites his old one
@@ -5088,36 +5090,69 @@ int NewHighScore(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, setup.player_name))
+    {
+      // player already in high score list with better score or time
+
+      return -1;
+    }
   }
 
-  if (position >= 0)
+  return -1;
+}
+
+int NewHighScore(int level_nr)
+{
+  struct ScoreEntry new_entry = {{ 0 }}; // (prevent warning from GCC bug 53119)
+
+  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);
+
+  if (scores.last_added >= 0)
   {
-    SaveScoreTape(level_nr);
     SaveScore(level_nr);
+
+    if (game.LevelSolved_SaveTape)
+    {
+      SaveScoreTape(level_nr);
+      SaveServerScore(level_nr);
+    }
+  }
+
+  return 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)