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

Cleanups

This commit is contained in:
twinaphex 2020-02-14 14:11:25 +01:00
parent 3b2a3c1277
commit dad077adf3
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
input/input_remapping.c
View File

@ -63,7 +63,7 @@ bool input_remapping_load_file(void *data, const char *path)
"l3", "r3", "l_x+", "l_x-", "l_y+", "l_y-", "r_x+", "r_x-", "r_y+", "r_y-" }; "l3", "r3", "l_x+", "l_x-", "l_y+", "l_y-", "r_x+", "r_x-", "r_y+", "r_y-" };
old_analog_dpad_mode[i] = settings->uints.input_analog_dpad_mode[i]; old_analog_dpad_mode[i] = settings->uints.input_analog_dpad_mode[i];
old_libretro_device[i] = settings->uints.input_libretro_device[i]; old_libretro_device[i] = settings->uints.input_libretro_device[i];
s1[0] = '\0'; s1[0] = '\0';
s2[0] = '\0'; s2[0] = '\0';
@ -243,19 +243,16 @@ bool input_remapping_save_file(const char *path)
return ret; return ret;
} }
bool input_remapping_remove_file(const char *path) bool input_remapping_remove_file(const char *path,
const char *dir_input_remapping)
{ {
bool ret = false; bool ret = false;
size_t path_size = PATH_MAX_LENGTH * sizeof(char); size_t path_size = PATH_MAX_LENGTH * sizeof(char);
char *buf = (char*)malloc(PATH_MAX_LENGTH * sizeof(char)); char *buf = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
char *remap_file = (char*)malloc(PATH_MAX_LENGTH * sizeof(char)); char *remap_file = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
settings_t *settings = config_get_ptr(); buf[0] = remap_file[0] = '\0';
buf[0] = remap_file[0] = '\0';
fill_pathname_join(buf, settings->paths.directory_input_remapping,
path, path_size);
fill_pathname_join(buf, dir_input_remapping, path, path_size);
fill_pathname_noext(remap_file, buf, ".rmp", path_size); fill_pathname_noext(remap_file, buf, ".rmp", path_size);
ret = filestream_delete(remap_file) == 0 ? true : false; ret = filestream_delete(remap_file) == 0 ? true : false;

3
input/input_remapping.h
View File

@ -45,7 +45,8 @@ bool input_remapping_load_file(void *data, const char *path);
**/ **/
bool input_remapping_save_file(const char *path); bool input_remapping_save_file(const char *path);
bool input_remapping_remove_file(const char *path); bool input_remapping_remove_file(const char *path,
const char *dir_input_remapping);
void input_remapping_set_defaults(bool deinit); void input_remapping_set_defaults(bool deinit);

4
menu/cbs/menu_cbs_ok.c
View File

@ -3074,7 +3074,9 @@ static int generic_action_ok_remap_file_operation(const char *path,
} }
else else
{ {
if (input_remapping_remove_file(file)) if (input_remapping_remove_file(file,
settings->paths.directory_input_remapping
))
{ {
#ifdef HAVE_CONFIGFILE #ifdef HAVE_CONFIGFILE
switch (action_type) switch (action_type)