projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed build system for Android from Ant to Gradle
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index a6d6612b523457e8eee61b42d0ff6fc8ac78f6cd..911284641c352d07e6ff9111a895edab868606b7 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-2428,6
+2428,9
@@
static void HandleMenuScreen(int mx, int my, int dx, int dy, int button,
static int num_page_entries_all_last[NUM_SPECIAL_GFX_ARGS][MAX_MENU_MODES];
static int choice_stores[NUM_SPECIAL_GFX_ARGS][MAX_MENU_MODES];
static int first_entry_stores[NUM_SPECIAL_GFX_ARGS][MAX_MENU_MODES];
static int num_page_entries_all_last[NUM_SPECIAL_GFX_ARGS][MAX_MENU_MODES];
static int choice_stores[NUM_SPECIAL_GFX_ARGS][MAX_MENU_MODES];
static int first_entry_stores[NUM_SPECIAL_GFX_ARGS][MAX_MENU_MODES];
+ boolean has_scrollbar = screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->mapped;
+ int mx_scrollbar = screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->x;
+ int mx_right_border = (has_scrollbar ? mx_scrollbar : SX + SXSIZE);
int *num_page_entries_last = num_page_entries_all_last[game_status];
int *choice_store = choice_stores[game_status];
int *first_entry_store = first_entry_stores[game_status];
int *num_page_entries_last = num_page_entries_all_last[game_status];
int *choice_store = choice_stores[game_status];
int *first_entry_store = first_entry_stores[game_status];
@@
-2649,7
+2652,7
@@
static void HandleMenuScreen(int mx, int my, int dx, int dy, int button,
if (!anyScrollbarGadgetActive() &&
IN_VIS_MENU(x, y) &&
if (!anyScrollbarGadgetActive() &&
IN_VIS_MENU(x, y) &&
- mx <
screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->x
&&
+ mx <
mx_right_border
&&
y >= 0 && y < num_page_entries)
{
if (button)
y >= 0 && y < num_page_entries)
{
if (button)
@@
-3681,7
+3684,9
@@
static void DrawInfoScreen_Version(void)
}
DrawTextF(xstart1, ystart, font_head, "Platform");
}
DrawTextF(xstart1, ystart, font_head, "Platform");
- DrawTextF(xstart2, ystart, font_text, PLATFORM_STRING);
+ DrawTextF(xstart2, ystart, font_text, "%s (%s)",
+ PLATFORM_STRING,
+ PLATFORM_XX_BIT_STRING);
ystart += ystep_line;
DrawTextF(xstart1, ystart, font_head, "Target");
ystart += ystep_line;
DrawTextF(xstart1, ystart, font_head, "Target");
@@
-4203,6
+4208,9
@@
static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
TreeInfo **ti_ptr)
{
TreeInfo *ti = *ti_ptr;
TreeInfo **ti_ptr)
{
TreeInfo *ti = *ti_ptr;
+ boolean has_scrollbar = screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->mapped;
+ int mx_scrollbar = screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->x;
+ int mx_right_border = (has_scrollbar ? mx_scrollbar : SX + SXSIZE);
int x = 0;
int y = ti->cl_cursor;
int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
int x = 0;
int y = ti->cl_cursor;
int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
@@
-4397,7
+4405,7
@@
static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
if (!anyScrollbarGadgetActive() &&
IN_VIS_MENU(x, y) &&
if (!anyScrollbarGadgetActive() &&
IN_VIS_MENU(x, y) &&
- mx <
screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->x
&&
+ mx <
mx_right_border
&&
y >= 0 && y < num_page_entries)
{
if (button)
y >= 0 && y < num_page_entries)
{
if (button)
@@
-6279,12
+6287,13
@@
static struct TokenInfo setup_info_game[] =
static struct TokenInfo setup_info_engines[] =
{
static struct TokenInfo setup_info_engines[] =
{
- { TYPE_
EMPTY, NULL,
"Emerald Mine" },
+ { TYPE_
HEADLINE, NULL,
"Emerald Mine" },
{ TYPE_SWITCH, &setup.forced_scroll_delay, "Scroll Delay:" },
{ TYPE_SWITCH, &setup.forced_scroll_delay, "Scroll Delay:" },
- { TYPE_ECS_AGA, &setup.prefer_aga_graphics,"EMC graphics preference:" },
+ { TYPE_ECS_AGA, &setup.prefer_aga_graphics, "Amiga Graphics Chipset:" },
+ { TYPE_SWITCH, &setup.prefer_lowpass_sounds,"Low-Pass Filter Sounds:" },
{ TYPE_EMPTY, NULL, "" },
{ TYPE_EMPTY, NULL, "" },
- { TYPE_
EMPTY, NULL,
"Supaplex" },
- { TYPE_SWITCH,
&setup.sp_show_border_elements,"Supaplex
Border Elements:" },
+ { TYPE_
HEADLINE, NULL,
"Supaplex" },
+ { TYPE_SWITCH,
&setup.sp_show_border_elements, "
Border Elements:" },
{ TYPE_EMPTY, NULL, "" },
{ TYPE_LEAVE_MENU, execSetupMain, "Back" },
{ TYPE_EMPTY, NULL, "" },
{ TYPE_LEAVE_MENU, execSetupMain, "Back" },
@@
-7985,6
+7994,8
@@
static boolean ConfigureVirtualButtonsMain(void)
overlay.grid_button_highlight = grid_button[step_nr];
overlay.grid_button_highlight = grid_button[step_nr];
+ UnmapAllGadgets();
+
FadeSetEnterMenu();
FadeOut(REDRAW_FIELD);
FadeSetEnterMenu();
FadeOut(REDRAW_FIELD);