added loading high scores from score server

[rocksndiamonds.git] / src / screens.c

diff --git a/src/screens.c b/src/screens.c
index 0937577f26b411e625a05550634257599f7482c8..d86fa57267864ca83e626f6917683fddb8966c8a 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -5051,6 +5051,12 @@ void DrawHallOfFame(int level_nr, int highlight_position)
   else
     SetAnimStatus(GAME_MODE_PSEUDO_SCORESNEW);
 
+  LoadServerScore(level_nr);
+
+  // correct highlight position after adding server scores
+  if (highlight_position >= 0)
+    highlight_position = scores.last_added;
+
   FadeSetEnterScreen();
 
   FadeOut(fade_mask);
@@ -5071,27 +5077,20 @@ void DrawHallOfFame(int level_nr, int highlight_position)
 
 static char *getHallOfFameScoreText(int nr)
 {
-  // use playing time instead of score for Supaplex levels
-  if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
-  {
-    static char score_text[10];
-    int time_final_max = 999;
-    int time_seconds = scores.entry[nr].time / FRAMES_PER_SECOND;
-    int score = scores.entry[nr].score;
+  if (!level.rate_time_over_score)
+    return int2str(scores.entry[nr].score, 5); // show normal score
 
-    // convert old score file entries without playing time
-    if (time_seconds == 0 && score > 0 && score < time_final_max)
-      time_seconds = time_final_max - score - 1;
+  if (level.use_step_counter)
+    return int2str(scores.entry[nr].time, 5);  // show number of steps
 
-    int mm = (time_seconds / 60) % 60;
-    int ss = (time_seconds % 60);
+  static char score_text[10];
+  int time_seconds = scores.entry[nr].time / FRAMES_PER_SECOND;
+  int mm = (time_seconds / 60) % 60;
+  int ss = (time_seconds % 60);
 
-    sprintf(score_text, "%02d:%02d", mm, ss);
-
-    return score_text;
-  }
+  sprintf(score_text, "%02d:%02d", mm, ss);    // show playing time
 
-  return int2str(scores.entry[nr].score, 5);
+  return score_text;
 }
 
 static void drawHallOfFameList(int level_nr, int first_entry,