mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-25 12:41:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

(PS3) Implement S_RETURN_TO_LAUNCHER

Browse Source
This commit is contained in:
Twinaphex 2012-05-29 02:48:13 +02:00
parent 4bb5066691
commit 4f662ff0e2
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
console/console_settings.c
View File

@ -60,6 +60,11 @@ void rarch_settings_change(unsigned setting)
g_console.menu_enable = false; g_console.menu_enable = false;
g_console.mode_switch = MODE_EMULATION; g_console.mode_switch = MODE_EMULATION;
break; break;
case S_RETURN_TO_LAUNCHER:
g_console.return_to_launcher = true;
g_console.menu_enable = false;
g_console.mode_switch = MODE_EXIT;
break;
case S_RETURN_TO_MENU: case S_RETURN_TO_MENU:
g_console.menu_enable = false; g_console.menu_enable = false;
g_console.ingame_menu_item = 0; g_console.ingame_menu_item = 0;

1
console/console_settings.h
View File

@ -26,6 +26,7 @@ enum
S_OVERSCAN_INCREMENT, S_OVERSCAN_INCREMENT,
S_RETURN_TO_DASHBOARD, S_RETURN_TO_DASHBOARD,
S_RETURN_TO_GAME, S_RETURN_TO_GAME,
S_RETURN_TO_LAUNCHER,
S_RETURN_TO_MENU, S_RETURN_TO_MENU,
S_ROTATION_DECREMENT, S_ROTATION_DECREMENT,
S_ROTATION_INCREMENT, S_ROTATION_INCREMENT,

17
ps3/menu.c
View File

@ -937,9 +937,7 @@ static void select_file(uint32_t menu_id)
{ {
strlcpy(g_console.launch_app_on_exit, path, sizeof(g_console.launch_app_on_exit)); strlcpy(g_console.launch_app_on_exit, path, sizeof(g_console.launch_app_on_exit));
set_libretro_core_as_launch = false; set_libretro_core_as_launch = false;
g_console.return_to_launcher = true; rarch_settings_change(S_RETURN_TO_LAUNCHER);
g_console.menu_enable = false;
g_console.mode_switch = MODE_EXIT;
} }
break; break;
} }
@ -2173,8 +2171,7 @@ static void ingame_menu(uint32_t menu_id)
{ {
if((g_settings.video.fbo_scale_x > MIN_SCALING_FACTOR)) if((g_settings.video.fbo_scale_x > MIN_SCALING_FACTOR))
{ {
g_settings.video.fbo_scale_x -= 1.0f; rarch_settings_change(S_SCALE_FACTOR_DECREMENT);
g_settings.video.fbo_scale_y -= 1.0f;
apply_scaling(FBO_REINIT); apply_scaling(FBO_REINIT);
set_delay = DELAY_MEDIUM; set_delay = DELAY_MEDIUM;
} }
@ -2186,8 +2183,7 @@ static void ingame_menu(uint32_t menu_id)
{ {
if((g_settings.video.fbo_scale_x < MAX_SCALING_FACTOR)) if((g_settings.video.fbo_scale_x < MAX_SCALING_FACTOR))
{ {
g_settings.video.fbo_scale_x += 1.0f; rarch_settings_change(S_SCALE_FACTOR_INCREMENT);
g_settings.video.fbo_scale_y += 1.0f;
apply_scaling(FBO_REINIT); apply_scaling(FBO_REINIT);
set_delay = DELAY_MEDIUM; set_delay = DELAY_MEDIUM;
} }
@ -2195,8 +2191,7 @@ static void ingame_menu(uint32_t menu_id)
} }
if(CTRL_START(state)) if(CTRL_START(state))
{ {
g_settings.video.fbo_scale_x = 2.0f; rarch_settings_default(S_DEF_SCALE_FACTOR);
g_settings.video.fbo_scale_y = 2.0f;
apply_scaling(FBO_REINIT); apply_scaling(FBO_REINIT);
} }
strlcpy(comment, "Press LEFT or RIGHT to change the [Scaling] settings.\nPress START to reset back to default values.", sizeof(comment)); strlcpy(comment, "Press LEFT or RIGHT to change the [Scaling] settings.\nPress START to reset back to default values.", sizeof(comment));
@ -2410,9 +2405,7 @@ static void ingame_menu(uint32_t menu_id)
strlcpy(g_console.launch_app_on_exit, MULTIMAN_EXECUTABLE, strlcpy(g_console.launch_app_on_exit, MULTIMAN_EXECUTABLE,
sizeof(g_console.launch_app_on_exit)); sizeof(g_console.launch_app_on_exit));
g_console.return_to_launcher = true; rarch_settings_change(S_RETURN_TO_DASHBOARD);
g_console.menu_enable = false;
g_console.mode_switch = MODE_EXIT;
} }
strlcpy(comment, "Press 'CROSS' to quit the emulator and return to multiMAN.", sizeof(comment)); strlcpy(comment, "Press 'CROSS' to quit the emulator and return to multiMAN.", sizeof(comment));
break; break;