mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 17:43:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Style nits.

Browse Source
This commit is contained in:
Themaister 2013-05-21 08:46:51 +02:00
parent 525993e55d
commit a66fdf8b5f
2 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
frontend/menu/rgui.c
View File

@ -639,31 +639,31 @@ static void render_text(rgui_handle_t *rgui)
snprintf(type_str, sizeof(type_str), (g_extern.lifecycle_mode_state & (1ULL << MODE_FPS_DRAW)) ? "ON" : "OFF"); snprintf(type_str, sizeof(type_str), (g_extern.lifecycle_mode_state & (1ULL << MODE_FPS_DRAW)) ? "ON" : "OFF");
break; break;
case RGUI_BROWSER_DIR_PATH: case RGUI_BROWSER_DIR_PATH:
if (g_settings.rgui_browser_directory[0]) if (*g_settings.rgui_browser_directory)
strlcpy(type_str, g_settings.rgui_browser_directory, sizeof(type_str)); strlcpy(type_str, g_settings.rgui_browser_directory, sizeof(type_str));
else else
strlcpy(type_str, "<default>", sizeof(type_str)); strlcpy(type_str, "<default>", sizeof(type_str));
break; break;
case RGUI_SAVEFILE_DIR_PATH: case RGUI_SAVEFILE_DIR_PATH:
if (g_extern.savefile_dir[0]) if (*g_extern.savefile_dir)
strlcpy(type_str, g_extern.savefile_dir, sizeof(type_str)); strlcpy(type_str, g_extern.savefile_dir, sizeof(type_str));
else else
strlcpy(type_str, "<ROM dir>", sizeof(type_str)); strlcpy(type_str, "<ROM dir>", sizeof(type_str));
break; break;
case RGUI_SAVESTATE_DIR_PATH: case RGUI_SAVESTATE_DIR_PATH:
if (g_extern.savestate_dir[0]) if (*g_extern.savestate_dir)
strlcpy(type_str, g_extern.savestate_dir, sizeof(type_str)); strlcpy(type_str, g_extern.savestate_dir, sizeof(type_str));
else else
strlcpy(type_str, "<ROM dir>", sizeof(type_str)); strlcpy(type_str, "<ROM dir>", sizeof(type_str));
break; break;
case RGUI_SHADER_DIR_PATH: case RGUI_SHADER_DIR_PATH:
if (g_settings.video.shader_dir[0]) if (*g_settings.video.shader_dir)
strlcpy(type_str, g_settings.video.shader_dir, sizeof(type_str)); strlcpy(type_str, g_settings.video.shader_dir, sizeof(type_str));
else else
strlcpy(type_str, "<default>", sizeof(type_str)); strlcpy(type_str, "<default>", sizeof(type_str));
break; break;
case RGUI_SYSTEM_DIR_PATH: case RGUI_SYSTEM_DIR_PATH:
if (g_settings.system_directory[0]) if (*g_settings.system_directory)
strlcpy(type_str, g_settings.system_directory, sizeof(type_str)); strlcpy(type_str, g_settings.system_directory, sizeof(type_str));
else else
strlcpy(type_str, "<ROM dir>", sizeof(type_str)); strlcpy(type_str, "<ROM dir>", sizeof(type_str));
@ -1337,25 +1337,25 @@ static int rgui_settings_toggle_setting(rgui_handle_t *rgui, unsigned setting, r
case RGUI_BROWSER_DIR_PATH: case RGUI_BROWSER_DIR_PATH:
if (action == RGUI_ACTION_START) if (action == RGUI_ACTION_START)
{ {
g_settings.rgui_browser_directory[0] = '\0'; *g_settings.rgui_browser_directory = '\0';
rgui->base_path[0] = '\0'; *rgui->base_path = '\0';
} }
break; break;
case RGUI_SAVEFILE_DIR_PATH: case RGUI_SAVEFILE_DIR_PATH:
if (action == RGUI_ACTION_START) if (action == RGUI_ACTION_START)
g_extern.savefile_dir[0] = '\0'; *g_extern.savefile_dir = '\0';
break; break;
case RGUI_SAVESTATE_DIR_PATH: case RGUI_SAVESTATE_DIR_PATH:
if (action == RGUI_ACTION_START) if (action == RGUI_ACTION_START)
g_extern.savestate_dir[0] = '\0'; *g_extern.savestate_dir = '\0';
break; break;
case RGUI_SHADER_DIR_PATH: case RGUI_SHADER_DIR_PATH:
if (action == RGUI_ACTION_START) if (action == RGUI_ACTION_START)
g_settings.video.shader_dir[0] = '\0'; *g_settings.video.shader_dir = '\0';
break; break;
case RGUI_SYSTEM_DIR_PATH: case RGUI_SYSTEM_DIR_PATH:
if (action == RGUI_ACTION_START) if (action == RGUI_ACTION_START)
g_settings.system_directory[0] = '\0'; *g_settings.system_directory = '\0';
break; break;
default: default:
break; break;

38
settings.c
View File

@ -625,7 +625,7 @@ bool config_load_file(const char *path)
#ifdef HAVE_RGUI #ifdef HAVE_RGUI
CONFIG_GET_PATH(rgui_browser_directory, "rgui_browser_directory"); CONFIG_GET_PATH(rgui_browser_directory, "rgui_browser_directory");
if (!strcmp(g_settings.rgui_browser_directory, "default")) if (!strcmp(g_settings.rgui_browser_directory, "default"))
g_settings.rgui_browser_directory[0] = '\0'; *g_settings.rgui_browser_directory = '\0';
#endif #endif
CONFIG_GET_BOOL(rewind_enable, "rewind_enable"); CONFIG_GET_BOOL(rewind_enable, "rewind_enable");
@ -676,9 +676,7 @@ bool config_load_file(const char *path)
if (!g_extern.has_set_save_path && config_get_path(conf, "savefile_directory", tmp_str, sizeof(tmp_str))) if (!g_extern.has_set_save_path && config_get_path(conf, "savefile_directory", tmp_str, sizeof(tmp_str)))
{ {
if (!strcmp(tmp_str, "default")) if (!strcmp(tmp_str, "default"))
{ *g_extern.savefile_dir = '\0';
g_extern.savefile_dir[0] = '\0';
}
else if (path_is_directory(tmp_str)) else if (path_is_directory(tmp_str))
{ {
strlcpy(g_extern.savefile_dir, tmp_str, sizeof(g_extern.savefile_dir)); strlcpy(g_extern.savefile_dir, tmp_str, sizeof(g_extern.savefile_dir));
@ -692,9 +690,7 @@ bool config_load_file(const char *path)
if (!g_extern.has_set_state_path && config_get_path(conf, "savestate_directory", tmp_str, sizeof(tmp_str))) if (!g_extern.has_set_state_path && config_get_path(conf, "savestate_directory", tmp_str, sizeof(tmp_str)))
{ {
if (!strcmp(tmp_str, "default")) if (!strcmp(tmp_str, "default"))
{ *g_extern.savestate_dir = '\0';
g_extern.savestate_dir[0] = '\0';
}
else if (path_is_directory(tmp_str)) else if (path_is_directory(tmp_str))
{ {
strlcpy(g_extern.savestate_dir, tmp_str, sizeof(g_extern.savestate_dir)); strlcpy(g_extern.savestate_dir, tmp_str, sizeof(g_extern.savestate_dir));
@ -712,9 +708,7 @@ bool config_load_file(const char *path)
} }
if (!strcmp(g_settings.system_directory, "default")) if (!strcmp(g_settings.system_directory, "default"))
{ *g_settings.system_directory = '\0';
g_settings.system_directory[0] = '\0';
}
config_read_keybinds_conf(conf); config_read_keybinds_conf(conf);
@ -936,26 +930,26 @@ bool config_save_file(const char *path)
config_set_bool(conf, "audio_rate_control", g_settings.audio.rate_control); config_set_bool(conf, "audio_rate_control", g_settings.audio.rate_control);
config_set_float(conf, "audio_rate_control_delta", g_settings.audio.rate_control_delta); config_set_float(conf, "audio_rate_control_delta", g_settings.audio.rate_control_delta);
if (g_settings.system_directory[0] == '\0') if (*g_settings.system_directory)
config_set_string(conf, "system_directory", "default");
else
config_set_string(conf, "system_directory", g_settings.system_directory); config_set_string(conf, "system_directory", g_settings.system_directory);
if (g_extern.savefile_dir[0] == '\0')
config_set_string(conf, "savefile_directory", "default");
else else
config_set_string(conf, "system_directory", "default");
if (*g_extern.savefile_dir)
config_set_string(conf, "savefile_directory", g_extern.savefile_dir); config_set_string(conf, "savefile_directory", g_extern.savefile_dir);
if (g_extern.savestate_dir[0] == '\0')
config_set_string(conf, "savestate_directory", "default");
else else
config_set_string(conf, "savefile_directory", "default");
if (*g_extern.savestate_dir)
config_set_string(conf, "savestate_directory", g_extern.savestate_dir); config_set_string(conf, "savestate_directory", g_extern.savestate_dir);
else
config_set_string(conf, "savestate_directory", "default");
#if defined(HAVE_RGUI) || defined(HAVE_RMENU) #if defined(HAVE_RGUI) || defined(HAVE_RMENU)
if (g_settings.rgui_browser_directory[0] == '\0') if (*g_settings.rgui_browser_directory)
config_set_string(conf, "rgui_browser_directory", "default");
else
config_set_string(conf, "rgui_browser_directory", g_settings.rgui_browser_directory); config_set_string(conf, "rgui_browser_directory", g_settings.rgui_browser_directory);
else
config_set_string(conf, "rgui_browser_directory", "default");
#endif #endif
#ifdef ANDROID #ifdef ANDROID