ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(RMenu) Fixes/cleanups

This commit is contained in:
twinaphex 2013-04-29 03:59:48 +02:00
parent 86628d3462
commit 51aa5b170f
3 changed files with 9 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
frontend/menu/rmenu.c
View File

@ -638,12 +638,14 @@ static int select_file(void *data, uint64_t input)
driver.video_poke->set_texture_frame(driver.video_data, menu_texture->pixels, driver.video_poke->set_texture_frame(driver.video_data, menu_texture->pixels,
true, menu_texture->width, menu_texture->height, 1.0f); true, menu_texture->width, menu_texture->height, 1.0f);
break; break;
case LIBRETRO_CHOICE: }
strlcpy(g_settings.libretro, path, sizeof(g_settings.libretro));
g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT); if (rgui->menu_type == LIBRETRO_CHOICE)
g_extern.lifecycle_mode_state |= (1ULL << MODE_EXITSPAWN); {
return -1; strlcpy(g_settings.libretro, path, sizeof(g_settings.libretro));
break; g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT);
g_extern.lifecycle_mode_state |= (1ULL << MODE_EXITSPAWN);
return -1;
} }
pop_menu_stack = true; pop_menu_stack = true;
@ -1160,14 +1162,6 @@ static int set_setting_action(uint8_t menu_type, unsigned switchvalue, uint64_t
#endif #endif
case SETTING_DEFAULT_AUDIO_ALL: case SETTING_DEFAULT_AUDIO_ALL:
break; break;
case SETTING_EMU_CURRENT_SAVE_STATE_SLOT:
if (input & (1ULL << DEVICE_NAV_LEFT))
settings_set(1ULL << S_SAVESTATE_DECREMENT);
if ((input & (1ULL << DEVICE_NAV_RIGHT)) || (input & (1ULL << DEVICE_NAV_B)))
settings_set(1ULL << S_SAVESTATE_INCREMENT);
if (input & (1ULL << DEVICE_NAV_START))
settings_set(1ULL << S_DEF_SAVE_STATE);
break;
case SETTING_EMU_SHOW_DEBUG_INFO_MSG: case SETTING_EMU_SHOW_DEBUG_INFO_MSG:
if ((input & (1ULL << DEVICE_NAV_LEFT)) || (input & (1ULL << DEVICE_NAV_RIGHT)) || (input & (1ULL << DEVICE_NAV_B))) if ((input & (1ULL << DEVICE_NAV_LEFT)) || (input & (1ULL << DEVICE_NAV_RIGHT)) || (input & (1ULL << DEVICE_NAV_B)))
settings_set(1ULL << S_INFO_DEBUG_MSG_TOGGLE); settings_set(1ULL << S_INFO_DEBUG_MSG_TOGGLE);
@ -1211,14 +1205,6 @@ static int set_setting_action(uint8_t menu_type, unsigned switchvalue, uint64_t
if (input & (1ULL << DEVICE_NAV_START)) if (input & (1ULL << DEVICE_NAV_START))
g_settings.rewind_granularity = 1; g_settings.rewind_granularity = 1;
break; break;
case SETTING_QUIT_RARCH:
if ((input & (1ULL << DEVICE_NAV_LEFT)) || (input & (1ULL << DEVICE_NAV_RIGHT)) || (input & (1ULL << DEVICE_NAV_B)) || (input & (1ULL << DEVICE_NAV_B)))
{
g_extern.lifecycle_mode_state &= ~((1ULL << MODE_GAME));
g_extern.lifecycle_mode_state |= (1ULL << MODE_EXIT);
return -1;
}
break;
case SETTING_EMU_AUDIO_MUTE: case SETTING_EMU_AUDIO_MUTE:
if ((input & (1ULL << DEVICE_NAV_LEFT)) || (input & (1ULL << DEVICE_NAV_RIGHT)) || (input & (1ULL << DEVICE_NAV_B))) if ((input & (1ULL << DEVICE_NAV_LEFT)) || (input & (1ULL << DEVICE_NAV_RIGHT)) || (input & (1ULL << DEVICE_NAV_B)))
settings_set(1ULL << S_AUDIO_MUTE); settings_set(1ULL << S_AUDIO_MUTE);
@ -2003,11 +1989,6 @@ static int select_setting(void *data, uint64_t input)
strlcpy(setting_text, "", sizeof(setting_text)); strlcpy(setting_text, "", sizeof(setting_text));
strlcpy(comment, "INFO - Reset all these settings.", sizeof(comment)); strlcpy(comment, "INFO - Reset all these settings.", sizeof(comment));
break; break;
case SETTING_EMU_CURRENT_SAVE_STATE_SLOT:
strlcpy(text, "Current save state slot", sizeof(text));
snprintf(setting_text, sizeof(setting_text), "%d", g_extern.state_slot);
strlcpy(comment, "INFO - Set the currently selected savestate slot.", sizeof(comment));
break;
/* emu-specific */ /* emu-specific */
case SETTING_EMU_SHOW_DEBUG_INFO_MSG: case SETTING_EMU_SHOW_DEBUG_INFO_MSG:
strlcpy(text, "Debug info messages", sizeof(text)); strlcpy(text, "Debug info messages", sizeof(text));
@ -2039,11 +2020,6 @@ static int select_setting(void *data, uint64_t input)
snprintf(setting_text, sizeof(setting_text), "%d", g_settings.rewind_granularity); snprintf(setting_text, sizeof(setting_text), "%d", g_settings.rewind_granularity);
strlcpy(comment, "INFO - Set the amount of frames to 'rewind'.", sizeof(comment)); strlcpy(comment, "INFO - Set the amount of frames to 'rewind'.", sizeof(comment));
break; break;
case SETTING_QUIT_RARCH:
strlcpy(text, "Quit RetroArch and save settings ", sizeof(text));
strlcpy(setting_text, "", sizeof(setting_text));
strlcpy(comment, "INFO - Quits RetroArch and saves the settings.", sizeof(comment));
break;
case SETTING_EMU_AUDIO_MUTE: case SETTING_EMU_AUDIO_MUTE:
strlcpy(text, "Mute Audio", sizeof(text)); strlcpy(text, "Mute Audio", sizeof(text));
if (g_extern.audio_data.mute) if (g_extern.audio_data.mute)

2
frontend/menu/rmenu.h
View File

@ -84,11 +84,9 @@ enum
#endif #endif
SETTING_ENABLE_CUSTOM_BGM, SETTING_ENABLE_CUSTOM_BGM,
SETTING_DEFAULT_AUDIO_ALL, SETTING_DEFAULT_AUDIO_ALL,
SETTING_EMU_CURRENT_SAVE_STATE_SLOT,
SETTING_EMU_SHOW_DEBUG_INFO_MSG, SETTING_EMU_SHOW_DEBUG_INFO_MSG,
SETTING_EMU_SHOW_INFO_MSG, SETTING_EMU_SHOW_INFO_MSG,
SETTING_EMU_SKIN, SETTING_EMU_SKIN,
SETTING_QUIT_RARCH,
SETTING_EMU_DEFAULT_ALL, SETTING_EMU_DEFAULT_ALL,
SETTING_EMU_REWIND_ENABLED, SETTING_EMU_REWIND_ENABLED,
SETTING_EMU_REWIND_GRANULARITY, SETTING_EMU_REWIND_GRANULARITY,

2
frontend/platform/platform_ps3.c
View File

@ -407,7 +407,7 @@ static void system_exitspawn(void)
if (g_extern.lifecycle_mode_state & (1ULL << MODE_EXITSPAWN_START_GAME)) if (g_extern.lifecycle_mode_state & (1ULL << MODE_EXITSPAWN_START_GAME))
should_load_game = true; should_load_game = true;
rarch_console_exec(g_extern.fullpath, should_load_game); rarch_console_exec(g_settings.libretro, should_load_game);
#endif #endif
#endif #endif