#define MENU_INFO_FONT_FOOT FONT_TEXT_4
#define MENU_INFO_SPACE_HEAD (menu.headline2_spacing_info[info_mode])
#define MENU_SCREEN_INFO_SPACE_LEFT (menu.left_spacing_info[info_mode])
+#define MENU_SCREEN_INFO_SPACE_MIDDLE (menu.middle_spacing_info[info_mode])
#define MENU_SCREEN_INFO_SPACE_RIGHT (menu.right_spacing_info[info_mode])
#define MENU_SCREEN_INFO_SPACE_TOP (menu.top_spacing_info[info_mode])
#define MENU_SCREEN_INFO_SPACE_BOTTOM (menu.bottom_spacing_info[info_mode])
+#define MENU_SCREEN_INFO_SPACE_LINE (menu.line_spacing_info[info_mode])
+#define MENU_SCREEN_INFO_SPACE_EXTRA (menu.extra_spacing_info[info_mode])
+#define MENU_SCREEN_INFO_TILE_SIZE_RAW (menu.tile_size_info[info_mode])
+#define MENU_SCREEN_INFO_TILE_SIZE (MENU_SCREEN_INFO_TILE_SIZE_RAW > 0 ? \
+ MENU_SCREEN_INFO_TILE_SIZE_RAW : TILEY)
+#define MENU_SCREEN_INFO_ENTRY_SIZE_RAW (menu.list_entry_size_info[info_mode])
+#define MENU_SCREEN_INFO_ENTRY_SIZE (MAX(MENU_SCREEN_INFO_ENTRY_SIZE_RAW, \
+ MENU_SCREEN_INFO_TILE_SIZE))
#define MENU_SCREEN_INFO_YSTART MENU_SCREEN_INFO_SPACE_TOP
-#define MENU_SCREEN_INFO_YSTEP (TILEY + 4)
+#define MENU_SCREEN_INFO_YSTEP (MENU_SCREEN_INFO_ENTRY_SIZE + \
+ MENU_SCREEN_INFO_SPACE_EXTRA)
#define MENU_SCREEN_INFO_YBOTTOM (SYSIZE - MENU_SCREEN_INFO_SPACE_BOTTOM)
#define MENU_SCREEN_INFO_YSIZE (MENU_SCREEN_INFO_YBOTTOM - \
MENU_SCREEN_INFO_YSTART - \
{
int graphic = getTitleScreenGraphic(nr, initial);
Bitmap *bitmap = graphic_info[graphic].bitmap;
+ int draw_masked = graphic_info[graphic].draw_masked;
int width = graphic_info[graphic].width;
int height = graphic_info[graphic].height;
int src_x = graphic_info[graphic].src_x;
ClearRectangleOnBackground(drawto, 0, 0, WIN_XSIZE, WIN_YSIZE);
- if (DrawingOnBackground(dst_x, dst_y))
+ if (DrawingOnBackground(dst_x, dst_y) && draw_masked)
BlitBitmapMasked(bitmap, drawto, src_x, src_y, width, height, dst_x, dst_y);
else
BlitBitmap(bitmap, drawto, src_x, src_y, width, height, dst_x, dst_y);
// store valid level series information
leveldir_last_valid = leveldir_current;
+ // store first level of this level set for "level_nr" style animations
+ SetAnimationFirstLevel(leveldir_current->first_level);
+
// needed if last screen (level choice) changed graphics, sounds or music
ReloadCustomArtwork(0);
return getFontHeight(font_nr) + getMenuTextSpacing(spacing_height, font_nr);
}
+static int getHeadlineSpacing(void)
+{
+ // special compatibility handling for "R'n'D jue 2022" game editions
+ int spacing_check = menu.headline1_spacing[GAME_MODE_SCOREINFO];
+ int spacing = (game_status == GAME_MODE_SCOREINFO ?
+ menu.headline1_spacing[GAME_MODE_SCOREINFO] :
+ menu.headline1_spacing_info[info_mode]);
+ int font = MENU_INFO_FONT_TITLE;
+
+ return (spacing_check != -2 ? getMenuTextStep(spacing, font) : 0);
+}
+
void DrawInfoScreen_NotAvailable(char *text_title, char *text_error)
{
int font_error = FONT_TEXT_2;
int font_foot = MENU_INFO_FONT_FOOT;
- int ystart = mSY - SY + MENU_SCREEN_INFO_YSTART;
+ int ystart = mSY - SY + MENU_SCREEN_INFO_YSTART + getHeadlineSpacing();
int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM;
SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO);
static int infoscreen_frame[MAX_INFO_ELEMENTS_IN_ARRAY];
int font_foot = MENU_INFO_FONT_FOOT;
int xstart = mSX + MENU_SCREEN_INFO_SPACE_LEFT;
- int ystart = mSY + MENU_SCREEN_INFO_YSTART;
+ int ystart = mSY + MENU_SCREEN_INFO_YSTART + getHeadlineSpacing();
int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM;
int ystep = MENU_SCREEN_INFO_YSTEP;
+ int row_height = MENU_SCREEN_INFO_ENTRY_SIZE;
+ int tilesize = MENU_SCREEN_INFO_TILE_SIZE;
+ int yoffset = (row_height - tilesize) / 2;
int element, action, direction;
int graphic;
int delay;
continue;
}
- j += infoscreen_step[i - start];
+ int ypos = i - start;
+ int ystart_pos = ystart + ypos * ystep + yoffset;
+
+ j += infoscreen_step[ypos];
element = helpanim_info[j].element;
action = helpanim_info[j].action;
if (delay == -1)
delay = 1000000;
- if (infoscreen_frame[i - start] == 0)
+ if (infoscreen_frame[ypos] == 0)
{
sync_frame = 0;
- infoscreen_frame[i - start] = delay - 1;
+ infoscreen_frame[ypos] = delay - 1;
}
else
{
- sync_frame = delay - infoscreen_frame[i - start];
- infoscreen_frame[i - start]--;
+ sync_frame = delay - infoscreen_frame[ypos];
+ infoscreen_frame[ypos]--;
}
if (helpanim_info[j].element == HELPANIM_LIST_NEXT)
{
- if (!infoscreen_frame[i - start])
- infoscreen_step[i - start] = 0;
+ if (!infoscreen_frame[ypos])
+ infoscreen_step[ypos] = 0;
}
else
{
- if (!infoscreen_frame[i - start])
- infoscreen_step[i - start]++;
+ if (!infoscreen_frame[ypos])
+ infoscreen_step[ypos]++;
while (helpanim_info[j].element != HELPANIM_LIST_NEXT)
j++;
}
j++;
- ClearRectangleOnBackground(drawto, xstart, ystart + (i - start) * ystep,
- TILEX, TILEY);
- DrawFixedGraphicAnimationExt(drawto, xstart, ystart + (i - start) * ystep,
- graphic, sync_frame, USE_MASKING);
+ ClearRectangleOnBackground(drawto, xstart, ystart_pos, tilesize, tilesize);
+ DrawSizedGraphicAnimationExt(drawto, xstart, ystart_pos,
+ graphic, sync_frame, tilesize, USE_MASKING);
if (init)
- DrawInfoScreen_HelpText(element, action, direction, i - start);
+ DrawInfoScreen_HelpText(element, action, direction, ypos);
i++;
}
int font_nr = FONT_INFO_ELEMENTS;
int font_width = getFontWidth(font_nr);
int font_height = getFontHeight(font_nr);
- int yoffset = (TILEX - 2 * font_height) / 2;
- int xstart = mSX + MENU_SCREEN_INFO_SPACE_LEFT + TILEX + MINI_TILEX;
- int ystart = mSY + MENU_SCREEN_INFO_YSTART + yoffset;
- int ystep = TILEY + 4;
+ int line_spacing = MENU_SCREEN_INFO_SPACE_LINE;
+ int left_spacing = MENU_SCREEN_INFO_SPACE_LEFT;
+ int middle_spacing = MENU_SCREEN_INFO_SPACE_MIDDLE;
+ int right_spacing = MENU_SCREEN_INFO_SPACE_RIGHT;
+ int line_height = font_height + line_spacing;
+ int row_height = MENU_SCREEN_INFO_ENTRY_SIZE;
+ int tilesize = MENU_SCREEN_INFO_TILE_SIZE;
+ int xstart = mSX + left_spacing + tilesize + middle_spacing;
+ int ystart = mSY + MENU_SCREEN_INFO_YSTART + getHeadlineSpacing();
+ int ystep = MENU_SCREEN_INFO_YSTEP;
int pad_left = xstart - SX;
- int pad_right = MENU_SCREEN_INFO_SPACE_RIGHT;
+ int pad_right = right_spacing;
int max_chars_per_line = (SXSIZE - pad_left - pad_right) / font_width;
- int max_lines_per_text = 2;
+ int max_lines_per_text = (row_height + line_spacing) / line_height;
char *text = NULL;
+ boolean autowrap = TRUE;
+ boolean centered = FALSE;
+ boolean parse_comments = FALSE;
if (action != -1 && direction != -1) // element.action.direction
text = getHelpText(element, action, direction);
if (text == NULL) // not found
text = "No description available";
- if (strlen(text) <= max_chars_per_line) // only one line of text
- ystart += getFontHeight(font_nr) / 2;
+ DisableDrawingText();
+
+ // first get number of text lines to calculate offset for centering text
+ int num_lines_printed =
+ DrawTextBuffer(0, 0, text, font_nr,
+ max_chars_per_line, -1, max_lines_per_text, line_spacing, -1,
+ autowrap, centered, parse_comments);
- DrawTextBuffer(xstart, ystart + ypos * ystep, text, font_nr,
- max_chars_per_line, -1, max_lines_per_text, 0, -1,
- TRUE, FALSE, FALSE);
+ EnableDrawingText();
+
+ int size_lines_printed = num_lines_printed * line_height - line_spacing;
+ int yoffset = (row_height - size_lines_printed) / 2;
+
+ DrawTextBuffer(xstart, ystart + ypos * ystep + yoffset, text, font_nr,
+ max_chars_per_line, -1, max_lines_per_text, line_spacing, -1,
+ autowrap, centered, parse_comments);
}
static void DrawInfoScreen_TitleScreen(void)
{
SetGameStatus(GAME_MODE_TITLE);
+ UnmapAllGadgets();
+
DrawTitleScreen();
}
{
SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_ELEMENTS);
+ UnmapAllGadgets();
FadeInfoSoundsAndMusic();
FadeOut(REDRAW_FIELD);
{
SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_MUSIC);
+ UnmapAllGadgets();
+
FadeOut(REDRAW_FIELD);
ClearField();
ystart += ystep_head;
}
+ if (!strEqual(list->played, UNKNOWN_NAME))
+ {
+ if (!strEqual(list->played_header, UNKNOWN_NAME))
+ DrawTextSCentered(ystart, font_head, list->played_header);
+ else
+ DrawTextSCentered(ystart, font_head, "played in");
+
+ ystart += ystep_head;
+
+ DrawTextFCentered(ystart, font_text, "%s", list->played);
+ ystart += ystep_head;
+ }
+ else if (!list->is_sound)
+ {
+ int music_level_nr = -1;
+ int i;
+
+ // check if this music is configured for a certain level
+ for (i = leveldir_current->first_level;
+ i <= leveldir_current->last_level; i++)
+ {
+ // (special case: "list->music" may be negative for unconfigured music)
+ if (levelset.music[i] != MUS_UNDEFINED &&
+ levelset.music[i] == list->music)
+ {
+ music_level_nr = i;
+
+ break;
+ }
+ }
+
+ if (music_level_nr != -1)
+ {
+ if (!strEqual(list->played_header, UNKNOWN_NAME))
+ DrawTextSCentered(ystart, font_head, list->played_header);
+ else
+ DrawTextSCentered(ystart, font_head, "played in");
+
+ ystart += ystep_head;
+
+ DrawTextFCentered(ystart, font_text, "level %03d", music_level_nr);
+ ystart += ystep_head;
+ }
+ }
+
DrawTextSCentered(ybottom, font_foot, TEXT_NEXT_PAGE);
if (button != MB_MENU_INITIALIZE)
int ystep_head = getMenuTextStep(spacing_head, font_head);
int ystep_para = getMenuTextStep(spacing_para, font_text);
int ystep_line = getMenuTextStep(spacing_line, font_text);
- int ystart = mSY - SY + MENU_SCREEN_INFO_YSTART;
+ int ystart = mSY - SY + MENU_SCREEN_INFO_YSTART + getHeadlineSpacing();
int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM;
int xstart1 = mSX - SX + 2 * xstep;
int xstart2 = mSX - SX + 18 * xstep;
SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_VERSION);
+ UnmapAllGadgets();
FadeInfoSoundsAndMusic();
FadeOut(REDRAW_FIELD);
int lines = height / getFontHeight(font_text);
int padx = (width - chars * getFontWidth(font_text)) / 2;
int line_spacing = getMenuTextSpacing(spacing_line, font_text);
+ int xstart = mSX + padx;
+ int ystart = mSY + MENU_SCREEN_INFO_YSTART + getHeadlineSpacing();
boolean autowrap = FALSE;
boolean centered = TRUE;
boolean parse_comments = TRUE;
- DrawTextFile(mSX + padx, mSY + MENU_SCREEN_INFO_YSTART,
+ DrawTextFile(xstart, ystart,
filename, font_text, chars, -1, lines, line_spacing, -1,
autowrap, centered, parse_comments);
}
// if y position set to "-1", use static default value
if (tmi->y == -1)
- tmi->y = MENU_SCREEN_INFO_YSTART;
+ tmi->y = MENU_SCREEN_INFO_YSTART + getHeadlineSpacing();
// if width set to "-1", automatically determine by playfield width
if (tmi->width == -1)
{
SetMainBackgroundImageIfDefined(getInfoScreenBackgroundImage_Generic());
+ UnmapAllGadgets();
FadeInfoSoundsAndMusic();
FadeOut(REDRAW_FIELD);
{
// store level set if chosen from "last played level set" menu
StoreLastPlayedLevels(leveldir_current);
+
+ // store if level set chosen from "last played level set" menu
+ SaveLevelSetup_LastSeries();
}
else if (game_status == GAME_MODE_NAMES)
{
struct ScoreEntry *entry = &scores.entry[entry_nr];
char *pos_text = getHallOfFameRankText(entry_nr, 0);
char *tape_date = getHallOfFameTapeDateText(entry);
- int font_head = MENU_INFO_FONT_HEAD;
- int font_text = MENU_INFO_FONT_TEXT;
- int font_foot = MENU_INFO_FONT_FOOT;
- int spacing_para = menu.paragraph_spacing[GAME_MODE_SCOREINFO];
- int spacing_line = menu.line_spacing[GAME_MODE_SCOREINFO];
+ int font_head = MENU_INFO_FONT_HEAD;
+ int font_text = MENU_INFO_FONT_TEXT;
+ int font_foot = MENU_INFO_FONT_FOOT;
+ int spacing_para = menu.paragraph_spacing[GAME_MODE_SCOREINFO];
+ int spacing_line = menu.line_spacing[GAME_MODE_SCOREINFO];
+ int spacing_left = menu.left_spacing[GAME_MODE_SCOREINFO];
+ int spacing_top = menu.top_spacing[GAME_MODE_SCOREINFO];
int xstep = getFontWidth(font_text);
- int ystep_para = getMenuTextStep(spacing_para, font_text);
- int ystep_line = getMenuTextStep(spacing_line, font_text);
- int xstart = mSX - SX + menu.left_spacing[GAME_MODE_SCOREINFO];
- int ystart = mSY - SY + menu.top_spacing[GAME_MODE_SCOREINFO];
+ int ystep_para = getMenuTextStep(spacing_para, font_text);
+ int ystep_line = getMenuTextStep(spacing_line, font_text);
+ int xstart = mSX - SX + spacing_left;
+ int ystart = mSY - SY + spacing_top + getHeadlineSpacing();
int ybottom = mSY - SY + SYSIZE - menu.bottom_spacing[GAME_MODE_SCOREINFO];
int xstart1 = xstart + xstep;
int xstart2 = xstart + xstep * 12;
boolean play_visible = !strEqual(tape_date, UNKNOWN_NAME);
int font_width = getFontWidth(font_text);
int font_height = getFontHeight(font_text);
- int tape_date_width = getTextWidth(tape_date, font_text);
+ int tape_date_width = getTextWidth(tape_date, font_text);
int pad_left = xstart2;
int pad_right = menu.right_spacing[GAME_MODE_SCOREINFO];
int max_chars_per_line = (SXSIZE - pad_left - pad_right) / font_width;
// set current scroll delay value to configured scroll delay value
scroll_delay_current =
- getTreeInfoFromIdentifier(scroll_delays,i_to_a(setup.scroll_delay_value));
+ getTreeInfoFromIdentifier(scroll_delays, i_to_a(setup.scroll_delay_value));
// if that fails, set current scroll delay to reliable default value
if (scroll_delay_current == NULL)
// set current volume value to configured volume value
volume_simple_current =
- getTreeInfoFromIdentifier(volumes_simple,i_to_a(setup.volume_simple));
+ getTreeInfoFromIdentifier(volumes_simple, i_to_a(setup.volume_simple));
// if that fails, set current volume to reliable default value
if (volume_simple_current == NULL)
// set current volume value to configured volume value
volume_loops_current =
- getTreeInfoFromIdentifier(volumes_loops,i_to_a(setup.volume_loops));
+ getTreeInfoFromIdentifier(volumes_loops, i_to_a(setup.volume_loops));
// if that fails, set current volume to reliable default value
if (volume_loops_current == NULL)
// set current volume value to configured volume value
volume_music_current =
- getTreeInfoFromIdentifier(volumes_music,i_to_a(setup.volume_music));
+ getTreeInfoFromIdentifier(volumes_music, i_to_a(setup.volume_music));
// if that fails, set current volume to reliable default value
if (volume_music_current == NULL)
{ TYPE_SWITCH, &setup.quick_switch, "Quick Player Focus Switch:" },
{ TYPE_SWITCH, &setup.quick_doors, "Quick Menu Doors:" },
{ TYPE_SWITCH, &setup.show_titlescreen,"Show Title Screens:" },
- { TYPE_SWITCH, &setup.toons, "Show Menu Animations:" },
+ { TYPE_SWITCH, &setup.toons, "Show Toons:" },
{ TYPE_SWITCH, &setup.small_game_graphics, "Small Game Graphics:" },
{ TYPE_YES_NO_AUTO, &setup.debug.xsn_mode, debug_xsn_mode },
{ TYPE_EMPTY, NULL, "" },
void HandleGameActions(void)
{
- if (setup.ask_on_game_over)
- CheckGameOver();
-
- if (game.restart_game_message != NULL)
- {
- RequestRestartGame(game.restart_game_message);
-
+ if (CheckRestartGame())
return;
- }
if (game_status != GAME_MODE_PLAYING)
return;
static struct
{
- int gfx_unpressed, gfx_pressed;
+ int gfx_unpressed, gfx_pressed, gfx_active;
struct MenuPosInfo *pos;
boolean *check_value;
int gadget_id;
} menubutton_info[NUM_SCREEN_MENUBUTTONS] =
{
{
- IMG_MENU_BUTTON_PREV_LEVEL, IMG_MENU_BUTTON_PREV_LEVEL_ACTIVE,
+ IMG_MENU_BUTTON_PREV_LEVEL, IMG_MENU_BUTTON_PREV_LEVEL_ACTIVE, -1,
&menu.main.button.prev_level, NULL,
SCREEN_CTRL_ID_PREV_LEVEL,
SCREEN_MASK_MAIN,
FALSE, "previous level"
},
{
- IMG_MENU_BUTTON_NEXT_LEVEL, IMG_MENU_BUTTON_NEXT_LEVEL_ACTIVE,
+ IMG_MENU_BUTTON_NEXT_LEVEL, IMG_MENU_BUTTON_NEXT_LEVEL_ACTIVE, -1,
&menu.main.button.next_level, NULL,
SCREEN_CTRL_ID_NEXT_LEVEL,
SCREEN_MASK_MAIN,
FALSE, "next level"
},
{
- IMG_MENU_BUTTON_PREV_LEVEL2, IMG_MENU_BUTTON_PREV_LEVEL2_ACTIVE,
+ IMG_MENU_BUTTON_PREV_LEVEL2, IMG_MENU_BUTTON_PREV_LEVEL2_ACTIVE, -1,
&menu.scores.button.prev_level, NULL,
SCREEN_CTRL_ID_PREV_LEVEL2,
SCREEN_MASK_SCORES | SCREEN_MASK_SCORES_INFO,
FALSE, "previous level"
},
{
- IMG_MENU_BUTTON_NEXT_LEVEL2, IMG_MENU_BUTTON_NEXT_LEVEL2_ACTIVE,
+ IMG_MENU_BUTTON_NEXT_LEVEL2, IMG_MENU_BUTTON_NEXT_LEVEL2_ACTIVE, -1,
&menu.scores.button.next_level, NULL,
SCREEN_CTRL_ID_NEXT_LEVEL2,
SCREEN_MASK_SCORES | SCREEN_MASK_SCORES_INFO,
FALSE, "next level"
},
{
- IMG_MENU_BUTTON_PREV_SCORE, IMG_MENU_BUTTON_PREV_SCORE_ACTIVE,
+ IMG_MENU_BUTTON_PREV_SCORE, IMG_MENU_BUTTON_PREV_SCORE_ACTIVE, -1,
&menu.scores.button.prev_score, NULL,
SCREEN_CTRL_ID_PREV_SCORE,
SCREEN_MASK_SCORES_INFO,
FALSE, "previous score"
},
{
- IMG_MENU_BUTTON_NEXT_SCORE, IMG_MENU_BUTTON_NEXT_SCORE_ACTIVE,
+ IMG_MENU_BUTTON_NEXT_SCORE, IMG_MENU_BUTTON_NEXT_SCORE_ACTIVE, -1,
&menu.scores.button.next_score, NULL,
SCREEN_CTRL_ID_NEXT_SCORE,
SCREEN_MASK_SCORES_INFO,
FALSE, "next score"
},
{
- IMG_MENU_BUTTON_PLAY_TAPE, IMG_MENU_BUTTON_PLAY_TAPE,
+ IMG_MENU_BUTTON_PLAY_TAPE, IMG_MENU_BUTTON_PLAY_TAPE, -1,
&menu.scores.button.play_tape, NULL,
SCREEN_CTRL_ID_PLAY_TAPE,
SCREEN_MASK_SCORES_INFO,
FALSE, "play tape"
},
{
- IMG_MENU_BUTTON_FIRST_LEVEL, IMG_MENU_BUTTON_FIRST_LEVEL_ACTIVE,
+ IMG_MENU_BUTTON_FIRST_LEVEL, IMG_MENU_BUTTON_FIRST_LEVEL_ACTIVE, -1,
&menu.main.button.first_level, NULL,
SCREEN_CTRL_ID_FIRST_LEVEL,
SCREEN_MASK_MAIN,
FALSE, "first level"
},
{
- IMG_MENU_BUTTON_LAST_LEVEL, IMG_MENU_BUTTON_LAST_LEVEL_ACTIVE,
+ IMG_MENU_BUTTON_LAST_LEVEL, IMG_MENU_BUTTON_LAST_LEVEL_ACTIVE, -1,
&menu.main.button.last_level, NULL,
SCREEN_CTRL_ID_LAST_LEVEL,
SCREEN_MASK_MAIN,
FALSE, "last level"
},
{
- IMG_MENU_BUTTON_LEVEL_NUMBER, IMG_MENU_BUTTON_LEVEL_NUMBER_ACTIVE,
+ IMG_MENU_BUTTON_LEVEL_NUMBER, IMG_MENU_BUTTON_LEVEL_NUMBER_ACTIVE, -1,
&menu.main.button.level_number, NULL,
SCREEN_CTRL_ID_LEVEL_NUMBER,
SCREEN_MASK_MAIN,
FALSE, "level number"
},
{
- IMG_MENU_BUTTON_LEFT, IMG_MENU_BUTTON_LEFT_ACTIVE,
+ IMG_MENU_BUTTON_LEFT, IMG_MENU_BUTTON_LEFT_ACTIVE, -1,
&menu.setup.button.prev_player, NULL,
SCREEN_CTRL_ID_PREV_PLAYER,
SCREEN_MASK_INPUT,
FALSE, "previous player"
},
{
- IMG_MENU_BUTTON_RIGHT, IMG_MENU_BUTTON_RIGHT_ACTIVE,
+ IMG_MENU_BUTTON_RIGHT, IMG_MENU_BUTTON_RIGHT_ACTIVE, -1,
&menu.setup.button.next_player, NULL,
SCREEN_CTRL_ID_NEXT_PLAYER,
SCREEN_MASK_INPUT,
FALSE, "next player"
},
{
- IMG_MENU_BUTTON_INSERT_SOLUTION, IMG_MENU_BUTTON_INSERT_SOLUTION_ACTIVE,
+ IMG_MENU_BUTTON_INSERT_SOLUTION, IMG_MENU_BUTTON_INSERT_SOLUTION_ACTIVE, -1,
&menu.main.button.insert_solution, NULL,
SCREEN_CTRL_ID_INSERT_SOLUTION,
SCREEN_MASK_MAIN_HAS_SOLUTION,
FALSE, "insert solution tape"
},
{
- IMG_MENU_BUTTON_PLAY_SOLUTION, IMG_MENU_BUTTON_PLAY_SOLUTION_ACTIVE,
+ IMG_MENU_BUTTON_PLAY_SOLUTION, IMG_MENU_BUTTON_PLAY_SOLUTION_ACTIVE, -1,
&menu.main.button.play_solution, NULL,
SCREEN_CTRL_ID_PLAY_SOLUTION,
SCREEN_MASK_MAIN_HAS_SOLUTION,
FALSE, "play solution tape"
},
{
- IMG_MENU_BUTTON_LEVELSET_INFO, IMG_MENU_BUTTON_LEVELSET_INFO_ACTIVE,
+ IMG_MENU_BUTTON_LEVELSET_INFO, IMG_MENU_BUTTON_LEVELSET_INFO_PRESSED,
+ IMG_MENU_BUTTON_LEVELSET_INFO_ACTIVE,
&menu.main.button.levelset_info, NULL,
SCREEN_CTRL_ID_LEVELSET_INFO,
SCREEN_MASK_MAIN_HAS_SET_INFO,
FALSE, "show level set info"
},
{
- IMG_MENU_BUTTON_SWITCH_ECS_AGA, IMG_MENU_BUTTON_SWITCH_ECS_AGA_ACTIVE,
+ IMG_MENU_BUTTON_SWITCH_ECS_AGA, IMG_MENU_BUTTON_SWITCH_ECS_AGA_ACTIVE, -1,
&menu.main.button.switch_ecs_aga, &setup.prefer_aga_graphics,
SCREEN_CTRL_ID_SWITCH_ECS_AGA,
SCREEN_MASK_MAIN,
FALSE, "switch ECS/AGA chipset"
},
{
- IMG_MENU_BUTTON_TOUCH_BACK, IMG_MENU_BUTTON_TOUCH_BACK,
+ IMG_MENU_BUTTON_TOUCH_BACK, IMG_MENU_BUTTON_TOUCH_BACK, -1,
&menu.setup.button.touch_back, NULL,
SCREEN_CTRL_ID_TOUCH_PREV_PAGE,
SCREEN_MASK_TOUCH,
TRUE, "previous page"
},
{
- IMG_MENU_BUTTON_TOUCH_NEXT, IMG_MENU_BUTTON_TOUCH_NEXT,
+ IMG_MENU_BUTTON_TOUCH_NEXT, IMG_MENU_BUTTON_TOUCH_NEXT, -1,
&menu.setup.button.touch_next, NULL,
SCREEN_CTRL_ID_TOUCH_NEXT_PAGE,
SCREEN_MASK_TOUCH,
TRUE, "next page"
},
{
- IMG_MENU_BUTTON_TOUCH_BACK2, IMG_MENU_BUTTON_TOUCH_BACK2,
+ IMG_MENU_BUTTON_TOUCH_BACK2, IMG_MENU_BUTTON_TOUCH_BACK2, -1,
&menu.setup.button.touch_back2, NULL,
SCREEN_CTRL_ID_TOUCH_PREV_PAGE2,
SCREEN_MASK_TOUCH2,
TRUE, "previous page"
},
{
- IMG_MENU_BUTTON_TOUCH_NEXT2, IMG_MENU_BUTTON_TOUCH_NEXT2,
+ IMG_MENU_BUTTON_TOUCH_NEXT2, IMG_MENU_BUTTON_TOUCH_NEXT2, -1,
&menu.setup.button.touch_next2, NULL,
SCREEN_CTRL_ID_TOUCH_NEXT_PAGE2,
SCREEN_MASK_TOUCH2,
boolean is_score_button = (screen_mask & SCREEN_MASK_SCORES_INFO);
boolean has_gfx_pressed = (menubutton_info[i].gfx_pressed ==
menubutton_info[i].gfx_unpressed);
+ boolean has_gfx_active = (menubutton_info[i].gfx_active != -1);
Bitmap *gd_bitmap_unpressed, *gd_bitmap_pressed;
+ Bitmap *gd_bitmap_unpressed_alt, *gd_bitmap_pressed_alt;
int gfx_unpressed, gfx_pressed;
+ int gfx_unpressed_alt, gfx_pressed_alt;
int x, y, width, height;
int gd_x1, gd_x2, gd_y1, gd_y2;
int gd_x1a, gd_x2a, gd_y1a, gd_y2a;
gfx_unpressed = menubutton_info[i].gfx_unpressed;
gfx_pressed = menubutton_info[i].gfx_pressed;
+ gfx_unpressed_alt = gfx_unpressed;
+ gfx_pressed_alt = gfx_pressed;
+
+ if (has_gfx_active)
+ {
+ gfx_unpressed_alt = menubutton_info[i].gfx_active;
+
+ type = GD_TYPE_CHECK_BUTTON_2;
+
+ if (menubutton_info[i].check_value != NULL)
+ checked = *menubutton_info[i].check_value;
+ }
+
gd_bitmap_unpressed = graphic_info[gfx_unpressed].bitmap;
gd_bitmap_pressed = graphic_info[gfx_pressed].bitmap;
+ gd_bitmap_unpressed_alt = graphic_info[gfx_unpressed_alt].bitmap;
+ gd_bitmap_pressed_alt = graphic_info[gfx_pressed_alt].bitmap;
+
gd_x1 = graphic_info[gfx_unpressed].src_x;
gd_y1 = graphic_info[gfx_unpressed].src_y;
gd_x2 = graphic_info[gfx_pressed].src_x;
gd_y2 = graphic_info[gfx_pressed].src_y;
- gd_x1a = gd_x1;
- gd_y1a = gd_y1;
- gd_x2a = gd_x2;
- gd_y2a = gd_y2;
+
+ gd_x1a = graphic_info[gfx_unpressed_alt].src_x;
+ gd_y1a = graphic_info[gfx_unpressed_alt].src_y;
+ gd_x2a = graphic_info[gfx_pressed_alt].src_x;
+ gd_y2a = graphic_info[gfx_pressed_alt].src_y;
if (has_gfx_pressed)
{
gd_y2a += graphic_info[gfx_pressed].active_yoffset;
type = GD_TYPE_CHECK_BUTTON;
- checked = *menubutton_info[i].check_value;
+
+ if (menubutton_info[i].check_value != NULL)
+ checked = *menubutton_info[i].check_value;
}
if (is_score_button)
GDI_CHECKED, checked,
GDI_DESIGN_UNPRESSED, gd_bitmap_unpressed, gd_x1, gd_y1,
GDI_DESIGN_PRESSED, gd_bitmap_pressed, gd_x2, gd_y2,
- GDI_ALT_DESIGN_UNPRESSED, gd_bitmap_unpressed, gd_x1a, gd_y1a,
- GDI_ALT_DESIGN_PRESSED, gd_bitmap_pressed, gd_x2a, gd_y2a,
+ GDI_ALT_DESIGN_UNPRESSED, gd_bitmap_unpressed_alt, gd_x1a, gd_y1a,
+ GDI_ALT_DESIGN_PRESSED, gd_bitmap_pressed_alt, gd_x2a, gd_y2a,
GDI_DIRECT_DRAW, FALSE,
GDI_OVERLAY_TOUCH_BUTTON, is_touch_button,
GDI_EVENT_MASK, event_mask,
case SCREEN_CTRL_ID_SCROLL_UP:
if (game_status == GAME_MODE_NAMES)
- HandleChoosePlayerName(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK);
+ HandleChoosePlayerName(0, 0, 0, -1 * SCROLL_LINE, MB_MENU_MARK);
else if (game_status == GAME_MODE_LEVELS)
- HandleChooseLevelSet(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK);
+ HandleChooseLevelSet(0, 0, 0, -1 * SCROLL_LINE, MB_MENU_MARK);
else if (game_status == GAME_MODE_LEVELNR)
- HandleChooseLevelNr(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK);
+ HandleChooseLevelNr(0, 0, 0, -1 * SCROLL_LINE, MB_MENU_MARK);
else if (game_status == GAME_MODE_SETUP)
- HandleSetupScreen(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK);
+ HandleSetupScreen(0, 0, 0, -1 * SCROLL_LINE, MB_MENU_MARK);
else if (game_status == GAME_MODE_INFO)
- HandleInfoScreen(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK);
+ HandleInfoScreen(0, 0, 0, -1 * SCROLL_LINE, MB_MENU_MARK);
else if (game_status == GAME_MODE_SCORES)
- HandleHallOfFame(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK);
+ HandleHallOfFame(0, 0, 0, -1 * SCROLL_LINE, MB_MENU_MARK);
break;
case SCREEN_CTRL_ID_SCROLL_DOWN:
if (game_status == GAME_MODE_NAMES)
- HandleChoosePlayerName(0,0, 0, +1 * SCROLL_LINE, MB_MENU_MARK);
+ HandleChoosePlayerName(0, 0, 0, +1 * SCROLL_LINE, MB_MENU_MARK);
else if (game_status == GAME_MODE_LEVELS)
- HandleChooseLevelSet(0,0, 0, +1 * SCROLL_LINE, MB_MENU_MARK);
+ HandleChooseLevelSet(0, 0, 0, +1 * SCROLL_LINE, MB_MENU_MARK);
else if (game_status == GAME_MODE_LEVELNR)
- HandleChooseLevelNr(0,0, 0, +1 * SCROLL_LINE, MB_MENU_MARK);
+ HandleChooseLevelNr(0, 0, 0, +1 * SCROLL_LINE, MB_MENU_MARK);
else if (game_status == GAME_MODE_SETUP)
- HandleSetupScreen(0,0, 0, +1 * SCROLL_LINE, MB_MENU_MARK);
+ HandleSetupScreen(0, 0, 0, +1 * SCROLL_LINE, MB_MENU_MARK);
else if (game_status == GAME_MODE_INFO)
- HandleInfoScreen(0,0, 0, +1 * SCROLL_LINE, MB_MENU_MARK);
+ HandleInfoScreen(0, 0, 0, +1 * SCROLL_LINE, MB_MENU_MARK);
else if (game_status == GAME_MODE_SCORES)
- HandleHallOfFame(0,0, 0, +1 * SCROLL_LINE, MB_MENU_MARK);
+ HandleHallOfFame(0, 0, 0, +1 * SCROLL_LINE, MB_MENU_MARK);
break;
case SCREEN_CTRL_ID_SCROLL_VERTICAL:
if (game_status == GAME_MODE_NAMES)
- HandleChoosePlayerName(0,0,999,gi->event.item_position,MB_MENU_INITIALIZE);
+ HandleChoosePlayerName(0, 0, 999, gi->event.item_position, MB_MENU_INITIALIZE);
else if (game_status == GAME_MODE_LEVELS)
- HandleChooseLevelSet(0,0,999,gi->event.item_position,MB_MENU_INITIALIZE);
+ HandleChooseLevelSet(0, 0, 999, gi->event.item_position, MB_MENU_INITIALIZE);
else if (game_status == GAME_MODE_LEVELNR)
- HandleChooseLevelNr(0,0,999,gi->event.item_position,MB_MENU_INITIALIZE);
+ HandleChooseLevelNr(0, 0, 999, gi->event.item_position, MB_MENU_INITIALIZE);
else if (game_status == GAME_MODE_SETUP)
- HandleSetupScreen(0,0, 999,gi->event.item_position,MB_MENU_INITIALIZE);
+ HandleSetupScreen(0, 0, 999, gi->event.item_position, MB_MENU_INITIALIZE);
else if (game_status == GAME_MODE_INFO)
- HandleInfoScreen(0,0, 999,gi->event.item_position,MB_MENU_INITIALIZE);
+ HandleInfoScreen(0, 0, 999, gi->event.item_position, MB_MENU_INITIALIZE);
else if (game_status == GAME_MODE_SCORES)
- HandleHallOfFame(0,0, 999,gi->event.item_position,MB_MENU_INITIALIZE);
+ HandleHallOfFame(0, 0, 999, gi->event.item_position, MB_MENU_INITIALIZE);
break;
case SCREEN_CTRL_ID_NETWORK_SERVER:
projects / rocksndiamonds.git / blobdiff