diff --git a/ps3/main.c b/ps3/main.c index 15075558dd..23811e9049 100644 --- a/ps3/main.c +++ b/ps3/main.c @@ -110,6 +110,7 @@ static void set_default_settings(void) strlcpy(g_settings.cheat_database, usrDirPath, sizeof(g_settings.cheat_database)); g_settings.video.msg_pos_x = 0.09f; g_settings.video.msg_pos_y = 0.90f; + g_settings.video.aspect_ratio = -1.0f; // g_console g_console.block_config_read = true; @@ -154,6 +155,7 @@ static void init_settings(void) CONFIG_GET_BOOL(video.second_pass_smooth, "video_second_pass_smooth"); CONFIG_GET_BOOL(video.smooth, "video_smooth"); CONFIG_GET_BOOL(video.vsync, "video_vsync"); + CONFIG_GET_FLOAT(video.aspect_ratio, "video_aspect_ratio"); // g_console diff --git a/ps3/menu-entries.h b/ps3/menu-entries.h index 2d3b2bfb00..769c5e6244 100644 --- a/ps3/menu-entries.h +++ b/ps3/menu-entries.h @@ -488,6 +488,36 @@ static item items_generalsettings[MAX_NO_OF_CONTROLS_SETTINGS] = 0.09f, 0.83f, }, + { + SETTING_ENABLE_SRAM_PATH, + "Custom SRAM Dir Path", + "", + 0.0f, + 0.0f, + YELLOW, + "INFO - [Custom SRAM Dir Path] feature is set to 'OFF'.", + WHITE, + 0.91f, + 0.09f, + 0.83f, + 1, + 1 + }, + { + SETTING_ENABLE_STATE_PATH, + "Custom Save State Dir Path", + "", + 0.0f, + 0.0f, + YELLOW, + "INFO - [Custom Save State Dir Path] feature is set to 'OFF'.", + WHITE, + 0.91f, + 0.09f, + 0.83f, + 1, + 1 + }, { SETTING_PATH_DEFAULT_ALL, "DEFAULT", diff --git a/ps3/menu.c b/ps3/menu.c index eb21180550..4d1c4cfa79 100644 --- a/ps3/menu.c +++ b/ps3/menu.c @@ -784,6 +784,31 @@ static void set_setting_label(menu * menu_obj, int currentsetting) snprintf(menu_obj->items[currentsetting].setting_text, sizeof(menu_obj->items[currentsetting].setting_text), g_settings.cheat_database); break; + case SETTING_ENABLE_SRAM_PATH: + if(g_console.default_sram_dir_enable) + { + menu_obj->items[currentsetting].text_color = ORANGE; + snprintf(menu_obj->items[currentsetting].setting_text, sizeof(menu_obj->items[currentsetting].setting_text), "ON"); + } + else + { + menu_obj->items[currentsetting].text_color = GREEN; + snprintf(menu_obj->items[currentsetting].setting_text, sizeof(menu_obj->items[currentsetting].setting_text), "OFF"); + } + + break; + case SETTING_ENABLE_STATE_PATH: + if(g_console.default_savestate_dir_enable) + { + menu_obj->items[currentsetting].text_color = ORANGE; + snprintf(menu_obj->items[currentsetting].setting_text, sizeof(menu_obj->items[currentsetting].setting_text), "ON"); + } + else + { + menu_obj->items[currentsetting].text_color = GREEN; + snprintf(menu_obj->items[currentsetting].setting_text, sizeof(menu_obj->items[currentsetting].setting_text), "OFF"); + } + break; case SETTING_PATH_DEFAULT_ALL: if(menu_obj->selected == currentsetting) menu_obj->items[currentsetting].text_color = GREEN; @@ -1221,6 +1246,34 @@ static void producesettingentry(menu * menu_obj, uint64_t switchvalue) if(CTRL_START(state)) strcpy(g_settings.cheat_database, usrDirPath); break; + case SETTING_ENABLE_SRAM_PATH: + if(CTRL_LEFT(state) || CTRL_LSTICK_LEFT(state) || CTRL_RIGHT(state) || CTRL_LSTICK_RIGHT(state)) + { + g_console.default_sram_dir_enable = !g_console.default_sram_dir_enable; + menu_reinit_settings(); + set_text_message("", 7); + } + if(CTRL_START(state)) + { + g_console.default_sram_dir_enable = true; + menu_reinit_settings(); + set_text_message("", 7); + } + break; + case SETTING_ENABLE_STATE_PATH: + if(CTRL_LEFT(state) || CTRL_LSTICK_LEFT(state) || CTRL_RIGHT(state) || CTRL_LSTICK_RIGHT(state)) + { + g_console.default_savestate_dir_enable = !g_console.default_savestate_dir_enable; + menu_reinit_settings(); + set_text_message("", 7); + } + if(CTRL_START(state)) + { + g_console.default_savestate_dir_enable = true; + menu_reinit_settings(); + set_text_message("", 7); + } + break; case SETTING_PATH_DEFAULT_ALL: if(CTRL_LEFT(state) || CTRL_LSTICK_LEFT(state) || CTRL_RIGHT(state) || CTRL_LSTICK_RIGHT(state) || CTRL_CROSS(state) || CTRL_START(state)) { diff --git a/ps3/menu.h b/ps3/menu.h index 89b8dbb1f0..20e329a6e2 100644 --- a/ps3/menu.h +++ b/ps3/menu.h @@ -106,6 +106,8 @@ enum SETTING_PATH_SAVESTATES_DIRECTORY, SETTING_PATH_SRAM_DIRECTORY, SETTING_PATH_CHEATS, + SETTING_ENABLE_SRAM_PATH, + SETTING_ENABLE_STATE_PATH, SETTING_PATH_DEFAULT_ALL, SETTING_CONTROLS_SCHEME, SETTING_CONTROLS_NUMBER,