added selecting level from the high score screen

diff --git a/build-scripts/create_element_defs.pl b/build-scripts/create_element_defs.pl
index 3f5693fe4de0ab304a9b38181bd8d4adae64ae78..84d9bc6c6ad14289d5d5476eb1a66b048e2f5a76 100755 (executable)
--- a/build-scripts/create_element_defs.pl
+++ b/build-scripts/create_element_defs.pl
@@ -2509,6 +2509,7 @@ sub print_image_config_vars
 
            $var =~ s/^main\./menu.main./;
            $var =~ s/^setup\./menu.setup./;
+           $var =~ s/^scores\./menu.scores./;
            $var =~ s/^\[player\]\./game.player_/;
            $var =~ s/^\[title_initial\]/title_initial_default/;
            $var =~ s/^\[title\]/title_default/;

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index d5bb9a554c33db4a1554837db972908d219b2cd0..b42b955fc68751fe70298a95796151c898ed1a95 100644 (file)
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -6137,6 +6137,15 @@ struct ConfigInfo image_config[] =
   { "menu.button_prev_level.active",           UNDEFINED_FILENAME      },
   { "menu.button_prev_level.active.clone_from",        "menu.button_left.active" },
 
+  { "menu.button_next_level2",                 UNDEFINED_FILENAME      },
+  { "menu.button_next_level2.clone_from",      "menu.button_right"     },
+  { "menu.button_next_level2.active",          UNDEFINED_FILENAME      },
+  { "menu.button_next_level2.active.clone_from", "menu.button_right.active" },
+  { "menu.button_prev_level2",                 UNDEFINED_FILENAME      },
+  { "menu.button_prev_level2.clone_from",      "menu.button_left"      },
+  { "menu.button_prev_level2.active",          UNDEFINED_FILENAME      },
+  { "menu.button_prev_level2.active.clone_from", "menu.button_left.active" },
+
   { "menu.button_name",                                UNDEFINED_FILENAME      },
   { "menu.button_name.clone_from",             "menu.button"           },
   { "menu.button_name.active",                 UNDEFINED_FILENAME      },
@@ -8311,6 +8320,11 @@ struct ConfigInfo image_config[] =
   { "setup.button.touch_next2.x",              "-60"                   },
   { "setup.button.touch_next2.y",              "-60"                   },
 
+  { "scores.button.prev_level.x",              "-1"                    },
+  { "scores.button.prev_level.y",              "-1"                    },
+  { "scores.button.next_level.x",              "-1"                    },
+  { "scores.button.next_level.y",              "-1"                    },
+
   { "preview.x",                               "272"                   },
   { "preview.y",                               "380"                   },
   { "preview.align",                           "center"                },

diff --git a/src/main.h b/src/main.h
index c5c52ded9e4393e0345be4f464330821e02940de..96658376bab2cad281c29b03ded8794644527d98 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -2798,6 +2798,17 @@ struct MenuSetupInfo
   struct MenuSetupButtonInfo button;
 };
 
+struct MenuScoresButtonInfo
+{
+  struct MenuPosInfo prev_level;
+  struct MenuPosInfo next_level;
+};
+
+struct MenuScoresInfo
+{
+  struct MenuScoresButtonInfo button;
+};
+
 struct TitleFadingInfo
 {
   int fade_mode;
@@ -2887,6 +2898,7 @@ struct MenuInfo
 
   struct MenuMainInfo main;
   struct MenuSetupInfo setup;
+  struct MenuScoresInfo scores;
 };
 
 struct DoorInfo

diff --git a/src/screens.c b/src/screens.c
index 4c361ae4d84b5550c83d82ec1124137f10f7149a..7b05d4f1f15ada61f7183fd95a3ecf1bffbee3f7 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -184,26 +184,28 @@
 // screen gadget identifiers
 #define SCREEN_CTRL_ID_PREV_LEVEL      0
 #define SCREEN_CTRL_ID_NEXT_LEVEL      1
-#define SCREEN_CTRL_ID_FIRST_LEVEL     2
-#define SCREEN_CTRL_ID_LAST_LEVEL      3
-#define SCREEN_CTRL_ID_LEVEL_NUMBER    4
-#define SCREEN_CTRL_ID_PREV_PLAYER     5
-#define SCREEN_CTRL_ID_NEXT_PLAYER     6
-#define SCREEN_CTRL_ID_INSERT_SOLUTION 7
-#define SCREEN_CTRL_ID_PLAY_SOLUTION   8
-#define SCREEN_CTRL_ID_SWITCH_ECS_AGA  9
-#define SCREEN_CTRL_ID_TOUCH_PREV_PAGE 10
-#define SCREEN_CTRL_ID_TOUCH_NEXT_PAGE 11
-#define SCREEN_CTRL_ID_TOUCH_PREV_PAGE2        12
-#define SCREEN_CTRL_ID_TOUCH_NEXT_PAGE2        13
-#define SCREEN_CTRL_ID_SCROLL_UP       14
-#define SCREEN_CTRL_ID_SCROLL_DOWN     15
-#define SCREEN_CTRL_ID_SCROLL_VERTICAL 16
-#define SCREEN_CTRL_ID_NETWORK_SERVER  17
-
-#define NUM_SCREEN_GADGETS             18
-
-#define NUM_SCREEN_MENUBUTTONS         14
+#define SCREEN_CTRL_ID_PREV_LEVEL2     2
+#define SCREEN_CTRL_ID_NEXT_LEVEL2     3
+#define SCREEN_CTRL_ID_FIRST_LEVEL     4
+#define SCREEN_CTRL_ID_LAST_LEVEL      5
+#define SCREEN_CTRL_ID_LEVEL_NUMBER    6
+#define SCREEN_CTRL_ID_PREV_PLAYER     7
+#define SCREEN_CTRL_ID_NEXT_PLAYER     8
+#define SCREEN_CTRL_ID_INSERT_SOLUTION 9
+#define SCREEN_CTRL_ID_PLAY_SOLUTION   10
+#define SCREEN_CTRL_ID_SWITCH_ECS_AGA  11
+#define SCREEN_CTRL_ID_TOUCH_PREV_PAGE 12
+#define SCREEN_CTRL_ID_TOUCH_NEXT_PAGE 13
+#define SCREEN_CTRL_ID_TOUCH_PREV_PAGE2        14
+#define SCREEN_CTRL_ID_TOUCH_NEXT_PAGE2        15
+#define SCREEN_CTRL_ID_SCROLL_UP       16
+#define SCREEN_CTRL_ID_SCROLL_DOWN     17
+#define SCREEN_CTRL_ID_SCROLL_VERTICAL 18
+#define SCREEN_CTRL_ID_NETWORK_SERVER  19
+
+#define NUM_SCREEN_GADGETS             20
+
+#define NUM_SCREEN_MENUBUTTONS         16
 #define NUM_SCREEN_SCROLLBUTTONS       2
 #define NUM_SCREEN_SCROLLBARS          1
 #define NUM_SCREEN_TEXTINPUT           1
@@ -213,6 +215,7 @@
 #define SCREEN_MASK_INPUT              (1 << 2)
 #define SCREEN_MASK_TOUCH              (1 << 3)
 #define SCREEN_MASK_TOUCH2             (1 << 4)
+#define SCREEN_MASK_SCORES             (1 << 5)
 
 // graphic position and size values for buttons and scrollbars
 #define SC_MENUBUTTON_XSIZE            TILEX
@@ -291,6 +294,7 @@ static boolean OfferUploadTapes(void);
 static void execOfferUploadTapes(void);
 
 static void DrawHallOfFame_setScoreEntries(void);
+static void HandleHallOfFame_SelectLevel(int, int);
 static char *getHallOfFameScoreText(int);
 
 static struct GadgetInfo *screen_gadget[NUM_SCREEN_GADGETS];
@@ -4866,7 +4870,12 @@ static void DrawChooseTree(TreeInfo **ti_ptr)
 
   OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
 
+  // map gadgets for high score screen
+  if (game_status == GAME_MODE_SCORES)
+    MapScreenMenuGadgets(SCREEN_MASK_SCORES);
+
   MapScreenTreeGadgets(*ti_ptr);
+
   HandleChooseTree(0, 0, 0, 0, MB_MENU_INITIALIZE, ti_ptr);
 
   DrawMaskedBorder(fade_mask);
@@ -5322,7 +5331,13 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
     y = ti->cl_cursor + dy;
   }
 
-  if (dx == 1)
+  if (game_status == GAME_MODE_SCORES && ABS(dx) == 1)
+  {
+    HandleHallOfFame_SelectLevel(1, dx);
+
+    return;
+  }
+  else if (dx == 1)
   {
     TreeInfo *node_first, *node_cursor;
     int entry_pos = ti->cl_first + y;
@@ -5772,6 +5787,44 @@ static char *getHallOfFameScoreText(int nr)
   return score_text;
 }
 
+static void HandleHallOfFame_SelectLevel(int step, int direction)
+{
+  int old_level_nr = level_nr;
+  int new_level_nr = old_level_nr + step * direction;
+
+  if (new_level_nr < leveldir_current->first_level)
+    new_level_nr = leveldir_current->first_level;
+  if (new_level_nr > leveldir_current->last_level)
+    new_level_nr = leveldir_current->last_level;
+
+  if (setup.handicap && new_level_nr > leveldir_current->handicap_level)
+    new_level_nr = leveldir_current->handicap_level;
+
+  if (new_level_nr != old_level_nr)
+  {
+    PlaySound(SND_MENU_ITEM_SELECTING);
+
+    scores.last_level_nr = level_nr = new_level_nr;
+
+    LoadLocalAndServerScore(level_nr, TRUE);
+
+    DrawHallOfFame_setScoreEntries();
+
+    // force remapping optional gadgets (especially scroll bar)
+    UnmapScreenTreeGadgets();
+
+    // redraw complete high score screen, as sub-title has changed
+    ClearField();
+
+    // redraw level selection buttons (which have just been erased)
+    RedrawScreenMenuGadgets(SCREEN_MASK_SCORES);
+
+    HandleChooseTree(0, 0, 0, 0, MB_MENU_INITIALIZE, &score_entry_current);
+
+    SaveLevelSetup_SeriesInfo();
+  }
+}
+
 void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
 {
   HandleChooseTree(mx, my, dx, dy, button, &score_entry_current);
@@ -9608,6 +9661,22 @@ static struct
     GD_EVENT_PRESSED | GD_EVENT_REPEATED,
     FALSE, "next level"
   },
+  {
+    IMG_MENU_BUTTON_PREV_LEVEL2, IMG_MENU_BUTTON_PREV_LEVEL2_ACTIVE,
+    &menu.scores.button.prev_level, NULL,
+    SCREEN_CTRL_ID_PREV_LEVEL2,
+    SCREEN_MASK_SCORES,
+    GD_EVENT_PRESSED | GD_EVENT_REPEATED,
+    FALSE, "previous level"
+  },
+  {
+    IMG_MENU_BUTTON_NEXT_LEVEL2, IMG_MENU_BUTTON_NEXT_LEVEL2_ACTIVE,
+    &menu.scores.button.next_level, NULL,
+    SCREEN_CTRL_ID_NEXT_LEVEL2,
+    SCREEN_MASK_SCORES,
+    GD_EVENT_PRESSED | GD_EVENT_REPEATED,
+    FALSE, "next level"
+  },
   {
     IMG_MENU_BUTTON_FIRST_LEVEL, IMG_MENU_BUTTON_FIRST_LEVEL_ACTIVE,
     &menu.main.button.first_level, NULL,
@@ -9777,8 +9846,10 @@ static void CreateScreenMenubuttons(void)
   for (i = 0; i < NUM_SCREEN_MENUBUTTONS; i++)
   {
     struct MenuPosInfo *pos = menubutton_info[i].pos;
+    int screen_mask = menubutton_info[i].screen_mask;
     boolean is_touch_button = menubutton_info[i].is_touch_button;
     boolean is_check_button = menubutton_info[i].check_value != NULL;
+    boolean is_score_button = (screen_mask == SCREEN_MASK_SCORES);
     Bitmap *gd_bitmap_unpressed, *gd_bitmap_pressed;
     int gfx_unpressed, gfx_pressed;
     int x, y, width, height;
@@ -9826,6 +9897,21 @@ static void CreateScreenMenubuttons(void)
       checked = *menubutton_info[i].check_value;
     }
 
+    if (is_score_button)
+    {
+      // if x/y set to -1, dynamically place buttons next to title text
+      int title_width = getTextWidth(INFOTEXT_SCORE_ENTRY, FONT_TITLE_1);
+
+      if (pos->x == -1)
+       x = (id == SCREEN_CTRL_ID_PREV_LEVEL2 ?
+            SX + (SXSIZE - title_width) / 2 - width * 3 / 2 :
+            id == SCREEN_CTRL_ID_NEXT_LEVEL2 ?
+            SX + (SXSIZE + title_width) / 2 + width / 2 : 0);
+
+      if (pos->y == -1)
+       y = mSY + MENU_TITLE1_YPOS;
+    }
+
     gi = CreateGadget(GDI_CUSTOM_ID, id,
                      GDI_CUSTOM_TYPE_ID, i,
                      GDI_IMAGE_ID, gfx_unpressed,
@@ -10165,6 +10251,14 @@ static void HandleScreenGadgets(struct GadgetInfo *gi)
       HandleMainMenu_SelectLevel(step, +1, NO_DIRECT_LEVEL_SELECT);
       break;
 
+    case SCREEN_CTRL_ID_PREV_LEVEL2:
+      HandleHallOfFame_SelectLevel(step, -1);
+      break;
+
+    case SCREEN_CTRL_ID_NEXT_LEVEL2:
+      HandleHallOfFame_SelectLevel(step, +1);
+      break;
+
     case SCREEN_CTRL_ID_FIRST_LEVEL:
       HandleMainMenu_SelectLevel(MAX_LEVELS, -1, NO_DIRECT_LEVEL_SELECT);
       break;