#define SETUPINPUT_SCREEN_POS_EMPTY2 (SETUPINPUT_SCREEN_POS_END - 1)
#define MENU_SETUP_FONT_TITLE FONT_TEXT_1
-#define MENU_SETUP_FONT_TEXT FONT_REQUEST
+#define MENU_SETUP_FONT_TEXT FONT_TITLE_2
/* for various menu stuff */
#define MENU_SCREEN_START_XPOS 1
#define DRAW_YOFFSET_INFO(i) (DRAW_MODE_INFO(i) == INFO_MODE_MAIN ? \
menu.draw_yoffset[GAME_MODE_INFO] : \
menu.draw_yoffset_info[DRAW_MODE_INFO(i)])
+#define EXTRA_SPACING_INFO(i) (DRAW_MODE_INFO(i) == INFO_MODE_MAIN ? \
+ menu.extra_spacing[GAME_MODE_INFO] : \
+ menu.extra_spacing_info[DRAW_MODE_INFO(i)])
#define DRAW_XOFFSET_SETUP(i) (DRAW_MODE_SETUP(i) == SETUP_MODE_MAIN ? \
menu.draw_xoffset[GAME_MODE_SETUP] : \
#define DRAW_YOFFSET_SETUP(i) (DRAW_MODE_SETUP(i) == SETUP_MODE_MAIN ? \
menu.draw_yoffset[GAME_MODE_SETUP] : \
menu.draw_yoffset_setup[DRAW_MODE_SETUP(i)])
+#define EXTRA_SPACING_SETUP(i) (DRAW_MODE_SETUP(i) == SETUP_MODE_MAIN ? \
+ menu.extra_spacing[GAME_MODE_SETUP] : \
+ menu.extra_spacing_setup[DRAW_MODE_SETUP(i)])
#define DRAW_XOFFSET(s) ((s) == GAME_MODE_INFO ? \
DRAW_XOFFSET_INFO(info_mode) : \
(s) == GAME_MODE_SETUP ? \
DRAW_YOFFSET_SETUP(setup_mode) : \
menu.draw_yoffset[DRAW_MODE(s)])
+#define EXTRA_SPACING(s) ((s) == GAME_MODE_INFO ? \
+ EXTRA_SPACING_INFO(info_mode) : \
+ (s) == GAME_MODE_SETUP ? \
+ EXTRA_SPACING_SETUP(setup_mode) : \
+ menu.extra_spacing[DRAW_MODE(s)])
#define mSX (SX + DRAW_XOFFSET(game_status))
#define mSY (SY + DRAW_YOFFSET(game_status))
if (redraw_mask & REDRAW_ALL)
fade_mask = REDRAW_ALL;
- if (CheckIfGlobalBorderHasChanged())
+ if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged())
fade_mask = REDRAW_ALL;
FadeOut(fade_mask);
if (redraw_mask & REDRAW_ALL)
fade_mask = REDRAW_ALL;
- if (CheckIfGlobalBorderHasChanged())
+ if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged())
fade_mask = REDRAW_ALL;
UnmapAllGadgets();
static int getMenuFontSpacing(int spacing_height, int font_nr)
{
- int font_spacing = getFontHeight(font_nr) + menu.extra_spacing;
+ int font_spacing = getFontHeight(font_nr) + EXTRA_SPACING(game_status);
return (spacing_height < 0 ? ABS(spacing_height) * font_spacing :
spacing_height);
static int getMenuTextSpacing(int spacing_height, int font_nr)
{
- return getMenuFontSpacing(spacing_height, font_nr) + menu.extra_spacing;
+ return (getMenuFontSpacing(spacing_height, font_nr) +
+ EXTRA_SPACING(game_status));
}
static int getMenuTextStep(int spacing_height, int font_nr)
{
int fade_mask = REDRAW_FIELD;
- if (CheckIfGlobalBorderHasChanged())
+ if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged())
fade_mask = REDRAW_ALL;
if (strEqual((*ti_ptr)->subdir, STRING_TOP_DIRECTORY))
{
int fade_mask = REDRAW_FIELD;
- if (CheckIfGlobalBorderHasChanged())
+ if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged())
fade_mask = REDRAW_ALL;
UnmapAllGadgets();
char *title_string = NULL;
int i;
- if (CheckIfGlobalBorderHasChanged())
+ if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged())
fade_mask = REDRAW_ALL;
UnmapAllGadgets();