notaz.gp2x.de
/
gpsp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add copyright message to gles_video
[gpsp.git]
/
gui.c
diff --git
a/gui.c
b/gui.c
index
0b0cd13
..
1779656
100644
(file)
--- a/
gui.c
+++ b/
gui.c
@@
-78,7
+78,7
@@
clock_speed = (clock_speed_number + 1) * 33
#define get_clock_speed_number() \
clock_speed_number = (clock_speed / 33) - 1
clock_speed = (clock_speed_number + 1) * 33
#define get_clock_speed_number() \
clock_speed_number = (clock_speed / 33) - 1
-#elif defined(
WIZ
_BUILD)
+#elif defined(
POLLUX
_BUILD)
static const char *clock_speed_options[] =
{
"300MHz", "333MHz", "366MHz", "400MHz", "433MHz",
static const char *clock_speed_options[] =
{
"300MHz", "333MHz", "366MHz", "400MHz", "433MHz",
@@
-552,7
+552,7
@@
typedef enum
NUMBER_SELECTION_OPTION = 0x01,
STRING_SELECTION_OPTION = 0x02,
SUBMENU_OPTION = 0x04,
NUMBER_SELECTION_OPTION = 0x01,
STRING_SELECTION_OPTION = 0x02,
SUBMENU_OPTION = 0x04,
- ACTION_OPTION = 0x08
+ ACTION_OPTION = 0x08
,
} menu_option_type_enum;
struct _menu_type
} menu_option_type_enum;
struct _menu_type
@@
-735,7
+735,7
@@
u32 gamepad_config_line_to_button[] =
#ifdef GP2X_BUILD
u32 gamepad_config_line_to_button[] =
#ifdef GP2X_BUILD
u32 gamepad_config_line_to_button[] =
- { 0, 2, 1, 3, 8, 9, 10, 11, 6, 7, 4, 5, 14 };
+ { 0, 2, 1, 3, 8, 9, 10, 11, 6, 7, 4, 5, 14
, 15
};
#endif
#endif
@@
-746,6
+746,13
@@
u32 gamepad_config_line_to_button[] =
#endif
#endif
+#ifdef RPI_BUILD
+
+u32 gamepad_config_line_to_button[] =
+ { 0, 2, 1, 3, 8, 9, 10, 11, 6, 7, 4, 5, 12, 13, 14, 15 };
+
+#endif
+
static const char *scale_options[] =
{
#ifdef PSP_BUILD
static const char *scale_options[] =
{
#ifdef PSP_BUILD
@@
-753,10
+760,14
@@
static const char *scale_options[] =
#elif defined(WIZ_BUILD)
"unscaled 3:2", "scaled 3:2 (slower)",
"unscaled 3:2 (anti-tear)", "scaled 3:2 (anti-tear)"
#elif defined(WIZ_BUILD)
"unscaled 3:2", "scaled 3:2 (slower)",
"unscaled 3:2 (anti-tear)", "scaled 3:2 (anti-tear)"
+#elif defined(POLLUX_BUILD)
+ "unscaled 3:2", "scaled 3:2 (slower)"
#elif defined(PND_BUILD)
"unscaled", "2x", "3x", "fullscreen"
#elif defined(GP2X_BUILD)
"unscaled 3:2", "scaled 3:2", "fullscreen", "scaled 3:2 (software)"
#elif defined(PND_BUILD)
"unscaled", "2x", "3x", "fullscreen"
#elif defined(GP2X_BUILD)
"unscaled 3:2", "scaled 3:2", "fullscreen", "scaled 3:2 (software)"
+#elif defined(RPI_BUILD)
+ "fullscreen"
#else
"unscaled 3:2"
#endif
#else
"unscaled 3:2"
#endif
@@
-807,7
+818,7
@@
s32 load_game_config_file()
random_skip = file_options[2] % 2;
clock_speed = file_options[3];
random_skip = file_options[2] % 2;
clock_speed = file_options[3];
-#ifdef
WIZ
_BUILD
+#ifdef
POLLUX
_BUILD
if(clock_speed > 900)
clock_speed = 533;
#elif defined(GP2X_BUILD)
if(clock_speed > 900)
clock_speed = 533;
#elif defined(GP2X_BUILD)
@@
-841,10
+852,15
@@
s32 load_game_config_file()
if(file_loaded)
return 0;
if(file_loaded)
return 0;
+#ifdef RPI_BUILD
+ current_frameskip_type = manual_frameskip;
+ frameskip_value = 1;
+#else
current_frameskip_type = auto_frameskip;
frameskip_value = 4;
current_frameskip_type = auto_frameskip;
frameskip_value = 4;
-#ifdef
WIZ
_BUILD
+#ifdef
POLLUX
_BUILD
frameskip_value = 1;
frameskip_value = 1;
+#endif
#endif
random_skip = 0;
clock_speed = default_clock_speed;
#endif
random_skip = 0;
clock_speed = default_clock_speed;
@@
-1211,10
+1227,6
@@
u32 menu(u16 *original_screen)
reg[CHANGED_PC_STATUS] = 1;
menu_update_clock();
}
reg[CHANGED_PC_STATUS] = 1;
menu_update_clock();
}
- else
- {
- choose_menu(current_menu);
- }
}
void menu_restart()
}
void menu_restart()
@@
-1327,8
+1339,9
@@
u32 menu(u16 *original_screen)
static const char *update_backup_options[] = { "Exit only", "Automatic" };
// Marker for help information, don't go past this mark (except \n)------*
static const char *update_backup_options[] = { "Exit only", "Automatic" };
// Marker for help information, don't go past this mark (except \n)------*
- menu_option_type graphics_sound_options[] =
- {
+ menu_option_type graphics_sound_options[] =
+ {
+#ifndef RPI_BUILD
string_selection_option(NULL, "Display scaling", scale_options,
(u32 *)(&screen_scale),
sizeof(scale_options) / sizeof(scale_options[0]),
string_selection_option(NULL, "Display scaling", scale_options,
(u32 *)(&screen_scale),
sizeof(scale_options) / sizeof(scale_options[0]),
@@
-1342,6
+1355,8
@@
u32 menu(u16 *original_screen)
#endif
#endif
"", 2),
#endif
#endif
"", 2),
+#endif
+
#ifndef GP2X_BUILD
string_selection_option(NULL, "Screen filtering", yes_no_options,
(u32 *)(&screen_filter), 2,
#ifndef GP2X_BUILD
string_selection_option(NULL, "Screen filtering", yes_no_options,
(u32 *)(&screen_filter), 2,
@@
-1350,7
+1365,7
@@
u32 menu(u16 *original_screen)
"smooth image, at the cost of being blurry and having less vibrant\n"
"colors.", 3),
#endif
"smooth image, at the cost of being blurry and having less vibrant\n"
"colors.", 3),
#endif
-#if
def PND_BUILD
+#if
defined (PND_BUILD)
string_selection_option(NULL, "Scaling filter", filter2_options,
(u32 *)(&screen_filter2),
sizeof(filter2_options) / sizeof(filter2_options[0]),
string_selection_option(NULL, "Scaling filter", filter2_options,
(u32 *)(&screen_filter2),
sizeof(filter2_options) / sizeof(filter2_options[0]),
@@
-1531,18
+1546,25
@@
u32 menu(u16 *original_screen)
gamepad_config_option("Right Trigger", 9),
#ifdef WIZ_BUILD
gamepad_config_option("Menu ", 10),
gamepad_config_option("Right Trigger", 9),
#ifdef WIZ_BUILD
gamepad_config_option("Menu ", 10),
-#else
+ gamepad_config_option("Select ", 11),
+#elif defined(POLLUX_BUILD)
+ gamepad_config_option("I ", 10),
+ gamepad_config_option("II ", 11),
+ gamepad_config_option("Push ", 12),
+ gamepad_config_option("Home ", 13),
+#elif defined(PND_BUILD)
gamepad_config_option("Start ", 10),
gamepad_config_option("Start ", 10),
-#endif
gamepad_config_option("Select ", 11),
gamepad_config_option("Select ", 11),
-#if !defined(WIZ_BUILD) && !defined(PND_BUILD)
- gamepad_config_option("Stick Push ", 12),
-#endif
-#ifdef PND_BUILD
gamepad_config_option("1 ", 12),
gamepad_config_option("2 ", 13),
gamepad_config_option("3 ", 14),
gamepad_config_option("4 ", 15),
gamepad_config_option("1 ", 12),
gamepad_config_option("2 ", 13),
gamepad_config_option("3 ", 14),
gamepad_config_option("4 ", 15),
+#else // GP2X
+ gamepad_config_option("Start ", 10),
+ gamepad_config_option("Select ", 11),
+ gamepad_config_option("Stick Push ", 12),
+#endif
+#ifdef PND_BUILD
submenu_option(NULL, "Back", "Return to the main menu.", 16)
#else
submenu_option(NULL, "Back", "Return to the main menu.", 14)
submenu_option(NULL, "Back", "Return to the main menu.", 16)
#else
submenu_option(NULL, "Back", "Return to the main menu.", 14)
@@
-1552,12
+1574,18
@@
u32 menu(u16 *original_screen)
menu_option_type analog_config_options[] =
{
menu_option_type analog_config_options[] =
{
+#if defined(POLLUX_BUILD)
+ numeric_selection_option(NULL, "Analog sensitivity",
+ &analog_sensitivity_level, 10,
+ "Determine sensitivity/responsiveness of the analog input.\n"
+ "Lower numbers are less sensitive.", 8),
+#endif
submenu_option(NULL, "Back", "Return to the main menu.", 11)
};
#endif
submenu_option(NULL, "Back", "Return to the main menu.", 11)
};
#endif
-#if
def PC_BUILD
+#if
defined(PC_BUILD) || defined(RPI_BUILD)
menu_option_type gamepad_config_options[] =
{
menu_option_type gamepad_config_options[] =
{
@@
-1596,9
+1624,9
@@
u32 menu(u16 *original_screen)
submenu_option(&gamepad_config_menu, "Configure gamepad input",
"Select to change the in-game behavior of buttons\n"
"and d-pad.", 6),
submenu_option(&gamepad_config_menu, "Configure gamepad input",
"Select to change the in-game behavior of buttons\n"
"and d-pad.", 6),
-#ifndef
GP2X
_BUILD
+#ifndef
WIZ
_BUILD
submenu_option(&analog_config_menu, "Configure analog input",
submenu_option(&analog_config_menu, "Configure analog input",
- "Select to change the in-game behavior of the
PSP
analog nub.", 7),
+ "Select to change the in-game behavior of the analog nub.", 7),
#endif
submenu_option(&cheats_misc_menu, "Cheats and Miscellaneous options",
"Select to manage cheats, set backup behavior,\n"
#endif
submenu_option(&cheats_misc_menu, "Cheats and Miscellaneous options",
"Select to manage cheats, set backup behavior,\n"
@@
-1786,6
+1814,10
@@
u32 menu(u16 *original_screen)
if(current_option->option_type & SUBMENU_OPTION)
choose_menu(current_option->sub_menu);
if(current_option->option_type & SUBMENU_OPTION)
choose_menu(current_option->sub_menu);
+
+ if(current_menu == &main_menu)
+ choose_menu(&main_menu);
+
break;
default:
break;
default: