mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 15:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup rarch_main_command somewhat

Browse Source
This commit is contained in:
twinaphex 2015-01-10 02:06:51 +01:00
parent 264c03cd27
commit 498958b08e
1 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
retroarch.c
View File

@ -2220,8 +2220,11 @@ static bool save_core_config(void)
bool rarch_main_command(unsigned cmd) bool rarch_main_command(unsigned cmd)
{ {
unsigned i = 0;
bool boolean = false; bool boolean = false;
(void)i;
switch (cmd) switch (cmd)
{ {
case RARCH_CMD_LOAD_CONTENT_PERSIST: case RARCH_CMD_LOAD_CONTENT_PERSIST:
@ -2264,15 +2267,15 @@ bool rarch_main_command(unsigned cmd)
main_state(cmd); main_state(cmd);
break; break;
case RARCH_CMD_RESIZE_WINDOWED_SCALE: case RARCH_CMD_RESIZE_WINDOWED_SCALE:
if (g_extern.pending.windowed_scale != 0) if (g_extern.pending.windowed_scale == 0)
{ return false;
g_settings.video.scale = g_extern.pending.windowed_scale;
if (!g_settings.video.fullscreen) g_settings.video.scale = g_extern.pending.windowed_scale;
rarch_main_command(RARCH_CMD_REINIT);
g_extern.pending.windowed_scale = 0; if (!g_settings.video.fullscreen)
} rarch_main_command(RARCH_CMD_REINIT);
g_extern.pending.windowed_scale = 0;
break; break;
case RARCH_CMD_MENU_TOGGLE: case RARCH_CMD_MENU_TOGGLE:
if (g_extern.is_menu) if (g_extern.is_menu)
@ -2640,27 +2643,25 @@ bool rarch_main_command(unsigned cmd)
break; break;
case RARCH_CMD_SHADER_DIR_INIT: case RARCH_CMD_SHADER_DIR_INIT:
rarch_main_command(RARCH_CMD_SHADER_DIR_DEINIT); rarch_main_command(RARCH_CMD_SHADER_DIR_DEINIT);
if (!*g_settings.video.shader_dir)
return false;
g_extern.shader_dir.list = dir_list_new(g_settings.video.shader_dir,
"cg|cgp|glsl|glslp", false);
if (!g_extern.shader_dir.list || g_extern.shader_dir.list->size == 0)
{ {
unsigned i; rarch_main_command(RARCH_CMD_SHADER_DIR_DEINIT);
if (!*g_settings.video.shader_dir) return false;
return false;
g_extern.shader_dir.list = dir_list_new(g_settings.video.shader_dir,
"cg|cgp|glsl|glslp", false);
if (!g_extern.shader_dir.list || g_extern.shader_dir.list->size == 0)
{
rarch_main_command(RARCH_CMD_SHADER_DIR_DEINIT);
return false;
}
g_extern.shader_dir.ptr = 0;
dir_list_sort(g_extern.shader_dir.list, false);
for (i = 0; i < g_extern.shader_dir.list->size; i++)
RARCH_LOG("Found shader \"%s\"\n",
g_extern.shader_dir.list->elems[i].data);
} }
g_extern.shader_dir.ptr = 0;
dir_list_sort(g_extern.shader_dir.list, false);
for (i = 0; i < g_extern.shader_dir.list->size; i++)
RARCH_LOG("Found shader \"%s\"\n",
g_extern.shader_dir.list->elems[i].data);
break; break;
case RARCH_CMD_SAVEFILES: case RARCH_CMD_SAVEFILES:
save_files(); save_files();
@ -2828,13 +2829,10 @@ bool rarch_main_command(unsigned cmd)
} }
break; break;
case RARCH_CMD_RUMBLE_STOP: case RARCH_CMD_RUMBLE_STOP:
for (i = 0; i < MAX_USERS; i++)
{ {
int i; driver_set_rumble_state(i, RETRO_RUMBLE_STRONG, 0);
for (i = 0; i < MAX_USERS; i++) driver_set_rumble_state(i, RETRO_RUMBLE_WEAK, 0);
{
driver_set_rumble_state(i, RETRO_RUMBLE_STRONG, 0);
driver_set_rumble_state(i, RETRO_RUMBLE_WEAK, 0);
}
} }
break; break;
case RARCH_CMD_GRAB_MOUSE_TOGGLE: case RARCH_CMD_GRAB_MOUSE_TOGGLE: