X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=4fb4e148fbdc2e54621aeb3045d23f35defbe255;hb=fdb8c9a6ae3d2ed960506a57ddca1bafc55a67ea;hp=8e4fb8c9a3d6638cb19fc040cc6814b6e6a5c734;hpb=b4ae37046341bd74a32ee9e3f473d1d58e5efe6b;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index 8e4fb8c9..4fb4e148 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -2172,7 +2172,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 
 	SetGameStatus(GAME_MODE_SCORES);
 
-	DrawHallOfFame(level_nr, -1);
+	DrawHallOfFame(level_nr);
       }
       else if (pos == MAIN_CONTROL_EDITOR)
       {
@@ -5029,7 +5029,7 @@ void HandleChooseLevelNr(int mx, int my, int dx, int dy, int button)
   HandleChooseTree(mx, my, dx, dy, button, &level_number_current);
 }
 
-void DrawHallOfFame(int level_nr, int highlight_position)
+void DrawHallOfFame(int level_nr)
 {
   int fade_mask = REDRAW_FIELD;
 
@@ -5046,9 +5046,9 @@ void DrawHallOfFame(int level_nr, int highlight_position)
   SetDrawDeactivationMask(REDRAW_NONE);
   SetDrawBackgroundMask(REDRAW_FIELD);
 
-  if (highlight_position < 0) 
-    LoadScore(level_nr);
-  else
+  LoadLocalAndServerScore(level_nr, TRUE);
+
+  if (scores.last_added >= 0)
     SetAnimStatus(GAME_MODE_PSEUDO_SCORESNEW);
 
   FadeSetEnterScreen();
@@ -5062,37 +5062,47 @@ void DrawHallOfFame(int level_nr, int highlight_position)
 
   OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
 
-  HandleHallOfFame(level_nr, highlight_position, 0, 0, MB_MENU_INITIALIZE);
+  HandleHallOfFame(level_nr, 0, 0, 0, MB_MENU_INITIALIZE);
 
   DrawMaskedBorder(fade_mask);
 
   FadeIn(fade_mask);
 }
 
+static int getHallOfFameFirstEntry(int first_entry, int step)
+{
+  if (step == 0)
+    first_entry = scores.last_added - (NUM_MENU_ENTRIES_ON_SCREEN + 1) / 2 + 1;
+  else
+    first_entry += step;
+
+  if (first_entry < 0)
+    first_entry = 0;
+  else if (first_entry > MAX_SCORE_ENTRIES - NUM_MENU_ENTRIES_ON_SCREEN)
+    first_entry = MAX(0, MAX_SCORE_ENTRIES - NUM_MENU_ENTRIES_ON_SCREEN);
+
+  return first_entry;
+}
+
 static char *getHallOfFameScoreText(int nr)
 {
-  // use playing time instead of score for Supaplex levels
-  if (level.rate_time_over_score ||
-      level.game_engine_type == GAME_ENGINE_TYPE_SP)
-  {
-    if (level.use_step_counter)
-      return int2str(scores.entry[nr].time, 5);
+  if (!level.rate_time_over_score)
+    return int2str(scores.entry[nr].score, 5);	// show normal score
 
-    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);
+  if (level.use_step_counter)
+    return int2str(scores.entry[nr].time, 5);	// show number of steps
 
-    sprintf(score_text, "%02d:%02d", mm, ss);
+  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);
 
-    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,
-			       int highlight_position)
+static void drawHallOfFameList(int level_nr, int first_entry)
 {
   int i, j;
 
@@ -5106,7 +5116,7 @@ static void drawHallOfFameList(int level_nr, int first_entry,
   for (i = 0; i < NUM_MENU_ENTRIES_ON_SCREEN; i++)
   {
     int entry = first_entry + i;
-    boolean active = (entry == highlight_position);
+    boolean active = (entry == scores.last_added);
     int font_nr1 = (active ? FONT_TEXT_1_ACTIVE : FONT_TEXT_1);
     int font_nr2 = (active ? FONT_TEXT_2_ACTIVE : FONT_TEXT_2);
     int font_nr3 = (active ? FONT_TEXT_3_ACTIVE : FONT_TEXT_3);
@@ -5137,22 +5147,23 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
 {
   static int level_nr = 0;
   static int first_entry = 0;
-  static int highlight_position = 0;
   int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
 
   if (button == MB_MENU_INITIALIZE)
   {
     level_nr = mx;
-    highlight_position = my;
 
-    first_entry = highlight_position - (NUM_MENU_ENTRIES_ON_SCREEN + 1) / 2 + 1;
+    if (server_scores.updated)
+    {
+      // reload scores, using updated server score cache file
+      LoadLocalAndServerScore(level_nr, FALSE);
 
-    if (first_entry < 0)
-      first_entry = 0;
-    else if (first_entry + NUM_MENU_ENTRIES_ON_SCREEN > MAX_SCORE_ENTRIES)
-      first_entry = MAX(0, MAX_SCORE_ENTRIES - NUM_MENU_ENTRIES_ON_SCREEN);
+      server_scores.updated = FALSE;
+    }
+
+    first_entry = getHallOfFameFirstEntry(0, 0);
 
-    drawHallOfFameList(level_nr, first_entry, highlight_position);
+    drawHallOfFameList(level_nr, first_entry);
 
     return;
   }
@@ -5162,25 +5173,15 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
 
   if (dy < 0)
   {
-    if (first_entry > 0)
-    {
-      first_entry -= step;
-      if (first_entry < 0)
-	first_entry = 0;
+    first_entry = getHallOfFameFirstEntry(first_entry, -step);
 
-      drawHallOfFameList(level_nr, first_entry, highlight_position);
-    }
+    drawHallOfFameList(level_nr, first_entry);
   }
   else if (dy > 0)
   {
-    if (first_entry + NUM_MENU_ENTRIES_ON_SCREEN < MAX_SCORE_ENTRIES)
-    {
-      first_entry += step;
-      if (first_entry + NUM_MENU_ENTRIES_ON_SCREEN > MAX_SCORE_ENTRIES)
-	first_entry = MAX(0, MAX_SCORE_ENTRIES - NUM_MENU_ENTRIES_ON_SCREEN);
+    first_entry = getHallOfFameFirstEntry(first_entry, step);
 
-      drawHallOfFameList(level_nr, first_entry, highlight_position);
-    }
+    drawHallOfFameList(level_nr, first_entry);
   }
   else if (button == MB_MENU_LEAVE || button == MB_MENU_CHOICE)
   {
@@ -5203,6 +5204,17 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
       DrawMainMenu();
     }
   }
+  else if (server_scores.updated)
+  {
+    // reload scores, using updated server score cache file
+    LoadLocalAndServerScore(level_nr, FALSE);
+
+    server_scores.updated = FALSE;
+
+    first_entry = getHallOfFameFirstEntry(0, 0);
+
+    drawHallOfFameList(level_nr, first_entry);
+  }
 
   if (game_status == GAME_MODE_SCORES)
     PlayMenuSoundIfLoop();