mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-20 10:20:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move 'set default controls' function call outside 'set default

Browse Source 
settings' function
This commit is contained in:
Twinaphex 2012-09-10 01:48:39 +02:00
parent 6cc534217a
commit b710babeb2
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
console/rarch_console_settings.c
View File

@ -339,7 +339,7 @@ void rarch_settings_create_menu_item_label(char * str, unsigned setting, size_t
#define DEFAULT_GAMMA 0
#endif
void rarch_settings_set_default (const input_driver_t *input)
void rarch_settings_set_default(void)
{
// g_settings
g_settings.rewind_enable = false;
@ -374,8 +374,6 @@ void rarch_settings_set_default (const input_driver_t *input)
g_settings.video.msg_pos_y = 0.90f;
g_settings.video.aspect_ratio = -1.0f;
rarch_input_set_controls_default(input);
// g_console
g_console.block_config_read = true;
g_console.frame_advance_enable = false;

2
console/rarch_console_settings.h
View File

@ -107,7 +107,7 @@ enum
void rarch_settings_change(unsigned setting);
void rarch_settings_default(unsigned setting);
void rarch_settings_msg(unsigned setting, unsigned delay);
void rarch_settings_set_default (const input_driver_t *input);
void rarch_settings_set_default(void);
void rarch_settings_create_menu_item_label(char * str, unsigned setting, size_t size);
void rarch_settings_create_menu_item_label_w(wchar_t *strwbuf, unsigned setting, size_t size);

4
gx/frontend/main.c
View File

@ -520,6 +520,7 @@ int main(int argc, char *argv[])
char tmp_path[PATH_MAX];
const char *extension = default_paths.executable_extension;
snprintf(tmp_path, sizeof(tmp_path), "%s/", default_paths.core_dir);
const input_driver_t *input = &input_gx;
const char *path_prefix = tmp_path;
char full_path[1024];
@ -528,7 +529,8 @@ int main(int argc, char *argv[])
bool find_libretro_file = rarch_configure_libretro_core(full_path, path_prefix, path_prefix,
default_paths.config_file, extension);
rarch_settings_set_default(&input_gx);
rarch_settings_set_default();
rarch_input_set_controls_default(input);
rarch_config_load(default_paths.config_file, path_prefix, extension, find_libretro_file);
char core_name[64];

3
ps3/frontend/main.c
View File

@ -259,7 +259,8 @@ int main(int argc, char *argv[])
bool find_libretro_file = rarch_configure_libretro_core(core_exe_path, path_prefix, path_prefix,
default_paths.config_file, extension);
rarch_settings_set_default(input);
rarch_settings_set_default();
rarch_input_set_controls_default(input);
rarch_config_load(default_paths.config_file, path_prefix, extension, find_libretro_file);
init_libretro_sym();

3
xdk/frontend/main.c
View File

@ -166,7 +166,8 @@ int main(int argc, char *argv[])
bool find_libretro_file = rarch_configure_libretro_core(full_path, path_prefix, path_prefix,
default_paths.config_file, extension);
rarch_settings_set_default(input);
rarch_settings_set_default();
rarch_input_set_controls_default(input);
rarch_config_load(default_paths.config_file, path_prefix, extension, find_libretro_file);
init_libretro_sym();