#define SCREEN_CTRL_ID_NEXT_LEVEL 1
#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 SCREEN_CTRL_ID_PREV_SCORE 4
+#define SCREEN_CTRL_ID_NEXT_SCORE 5
+#define SCREEN_CTRL_ID_FIRST_LEVEL 6
+#define SCREEN_CTRL_ID_LAST_LEVEL 7
+#define SCREEN_CTRL_ID_LEVEL_NUMBER 8
+#define SCREEN_CTRL_ID_PREV_PLAYER 9
+#define SCREEN_CTRL_ID_NEXT_PLAYER 10
+#define SCREEN_CTRL_ID_INSERT_SOLUTION 11
+#define SCREEN_CTRL_ID_PLAY_SOLUTION 12
+#define SCREEN_CTRL_ID_SWITCH_ECS_AGA 13
+#define SCREEN_CTRL_ID_TOUCH_PREV_PAGE 14
+#define SCREEN_CTRL_ID_TOUCH_NEXT_PAGE 15
+#define SCREEN_CTRL_ID_TOUCH_PREV_PAGE2 16
+#define SCREEN_CTRL_ID_TOUCH_NEXT_PAGE2 17
+
+#define NUM_SCREEN_MENUBUTTONS 18
+
+#define SCREEN_CTRL_ID_SCROLL_UP 18
+#define SCREEN_CTRL_ID_SCROLL_DOWN 19
+#define SCREEN_CTRL_ID_SCROLL_VERTICAL 20
+#define SCREEN_CTRL_ID_NETWORK_SERVER 21
+
+#define NUM_SCREEN_GADGETS 22
+
#define NUM_SCREEN_SCROLLBUTTONS 2
#define NUM_SCREEN_SCROLLBARS 1
#define NUM_SCREEN_TEXTINPUT 1
#define SCREEN_MASK_TOUCH (1 << 3)
#define SCREEN_MASK_TOUCH2 (1 << 4)
#define SCREEN_MASK_SCORES (1 << 5)
+#define SCREEN_MASK_SCORES_INFO (1 << 6)
// graphic position and size values for buttons and scrollbars
#define SC_MENUBUTTON_XSIZE TILEX
static void DrawHallOfFame_setScoreEntries(void);
static void HandleHallOfFame_SelectLevel(int, int);
static void HandleHallOfFame_SelectLevelOrScore(int, int);
-static char *getHallOfFameRankText(int);
-static char *getHallOfFameScoreText(int);
+static char *getHallOfFameRankText(int, int);
+static char *getHallOfFameScoreText(int, int);
static struct GadgetInfo *screen_gadget[NUM_SCREEN_GADGETS];
int font_size_1 = getFontWidth(font_nr1);
int font_size_3 = getFontWidth(font_nr3);
int font_size_4 = getFontWidth(font_nr4);
- int text_size_1 = 3 * font_size_1;
+ int text_size_1 = 4 * font_size_1;
int text_size_4 = 5 * font_size_4;
int border = amSX - SX + getFontDrawOffsetX(font_nr1);
int dx1 = 0;
- int dx2 = text_size_1;
- int dx3 = dx2 + font_size_1;
+ int dx3 = text_size_1;
int dx4 = screen_width - startdx - 2 * border - text_size_4;
int num_dots = (dx4 - dx3) / font_size_3;
int startx1 = startx + dx1;
- int startx2 = startx + dx2;
int startx3 = startx + dx3;
int startx4 = startx + dx4;
int pos = node->pos;
- char *pos_text = getHallOfFameRankText(pos);
- char *dot_text = ".";
+ char *pos_text = getHallOfFameRankText(pos, 3);
int i;
DrawText(startx1, starty, pos_text, font_nr1);
- DrawText(startx2, starty, dot_text, font_nr1);
for (i = 0; i < num_dots; i++)
- DrawText(startx3 + i * font_size_3, starty, dot_text, font_nr3);
+ DrawText(startx3 + i * font_size_3, starty, ".", font_nr3);
if (!strEqual(scores.entry[pos].name, EMPTY_PLAYER_NAME))
DrawText(startx3, starty, scores.entry[pos].name, font_nr2);
- DrawText(startx4, starty, getHallOfFameScoreText(pos), font_nr4);
+ DrawText(startx4, starty, getHallOfFameScoreText(pos, 5), font_nr4);
}
else
{
DrawChooseTree(&score_entry_current);
}
-static char *getHallOfFameRankText(int nr)
+static char *getHallOfFameRankText(int nr, int size)
{
+ static char rank_text[10];
boolean forced = (scores.force_last_added && nr == scores.last_added);
+ char *rank_text_raw = (forced ? "???" : int2str(nr + 1, size));
+
+ sprintf(rank_text, "%s%s", rank_text_raw, (size > 0 || !forced ? "." : ""));
- return (forced ? "???" : int2str(nr + 1, 3));
+ return rank_text;
}
static char *getHallOfFameTimeText(int nr)
return score_text;
}
-static char *getHallOfFameScoreText(int nr)
+static char *getHallOfFameScoreText(int nr, int size)
{
if (!level.rate_time_over_score)
- return int2str(scores.entry[nr].score, 5); // show normal score
+ return int2str(scores.entry[nr].score, size); // show normal score
else if (level.use_step_counter)
- return int2str(scores.entry[nr].time, 5); // show number of steps
+ return int2str(scores.entry[nr].time, size); // show number of steps
else
- return getHallOfFameTimeText(nr); // show playing time
+ return getHallOfFameTimeText(nr); // show playing time
}
static void HandleHallOfFame_SelectLevel(int step, int direction)
static void DrawScoreInfo_Content(int entry_nr)
{
struct ScoreEntry *entry = &scores.entry[entry_nr];
- char *pos_text = getHallOfFameRankText(entry_nr);
+ char *pos_text = getHallOfFameRankText(entry_nr, 0);
int font_title = MENU_INFO_FONT_TITLE;
int font_head = MENU_INFO_FONT_HEAD;
int font_text = MENU_INFO_FONT_TEXT;
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,
+ SCREEN_MASK_SCORES | SCREEN_MASK_SCORES_INFO,
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,
+ SCREEN_MASK_SCORES | SCREEN_MASK_SCORES_INFO,
GD_EVENT_PRESSED | GD_EVENT_REPEATED,
FALSE, "next level"
},
+ {
+ IMG_MENU_BUTTON_PREV_SCORE, IMG_MENU_BUTTON_PREV_SCORE_ACTIVE,
+ &menu.scores.button.prev_score, NULL,
+ SCREEN_CTRL_ID_PREV_SCORE,
+ SCREEN_MASK_SCORES_INFO,
+ GD_EVENT_PRESSED | GD_EVENT_REPEATED,
+ FALSE, "previous score"
+ },
+ {
+ IMG_MENU_BUTTON_NEXT_SCORE, IMG_MENU_BUTTON_NEXT_SCORE_ACTIVE,
+ &menu.scores.button.next_score, NULL,
+ SCREEN_CTRL_ID_NEXT_SCORE,
+ SCREEN_MASK_SCORES_INFO,
+ GD_EVENT_PRESSED | GD_EVENT_REPEATED,
+ FALSE, "next score"
+ },
{
IMG_MENU_BUTTON_FIRST_LEVEL, IMG_MENU_BUTTON_FIRST_LEVEL_ACTIVE,
&menu.main.button.first_level, NULL,
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);
+ boolean is_score_button = (screen_mask & SCREEN_MASK_SCORES_INFO);
Bitmap *gd_bitmap_unpressed, *gd_bitmap_pressed;
int gfx_unpressed, gfx_pressed;
int x, y, width, height;
SX + (SXSIZE + title_width) / 2 + width / 2 : 0);
if (pos->y == -1)
- y = mSY + MENU_TITLE1_YPOS;
+ y = (id == SCREEN_CTRL_ID_PREV_LEVEL2 ||
+ id == SCREEN_CTRL_ID_NEXT_LEVEL2 ? mSY + MENU_TITLE1_YPOS : 0);
}
gi = CreateGadget(GDI_CUSTOM_ID, id,
projects / rocksndiamonds.git / blobdiff