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

Add HAVE_NETPLAY ifdef

Browse Source
This commit is contained in:
twinaphex 2015-04-11 23:03:30 +02:00
parent c953b78f07
commit 89a5196403
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
configuration.c
View File

@ -1705,8 +1705,8 @@ bool config_load_override(void)
if (settings->core_specific_config) if (settings->core_specific_config)
{ {
RARCH_LOG("Can't use overrides in conjunction with per-core configs, disabling overrides\n"); RARCH_LOG("Can't use overrides in conjunction with per-core configs, disabling overrides\n");
return false; return false;
} }
RARCH_LOG("Core-specific overrides found at %s. Appending.\n", core_path); RARCH_LOG("Core-specific overrides found at %s. Appending.\n", core_path);
strlcpy(global->append_config_path, core_path, sizeof(global->append_config_path)); strlcpy(global->append_config_path, core_path, sizeof(global->append_config_path));
should_append = true; should_append = true;
@ -1725,11 +1725,11 @@ bool config_load_override(void)
RARCH_LOG("Game-specific overrides found at %s. Appending.\n", game_path); RARCH_LOG("Game-specific overrides found at %s. Appending.\n", game_path);
if (should_append) if (should_append)
{ {
strlcat(global->append_config_path, "|", sizeof(global->append_config_path)); strlcat(global->append_config_path, "|", sizeof(global->append_config_path));
strlcat(global->append_config_path, game_path, sizeof(global->append_config_path)); strlcat(global->append_config_path, game_path, sizeof(global->append_config_path));
} }
else else
strlcpy(global->append_config_path, game_path, sizeof(global->append_config_path)); strlcpy(global->append_config_path, game_path, sizeof(global->append_config_path));
should_append = true; should_append = true;
} }
@ -1743,25 +1743,27 @@ bool config_load_override(void)
if (settings->core_specific_config) if (settings->core_specific_config)
{ {
RARCH_WARN("Can't use overrides in conjunction with per-core configs, disabling overrides\n"); RARCH_WARN("Can't use overrides in conjunction with per-core configs, disabling overrides\n");
return false; return false;
} }
#ifdef HAVE_NETPLAY
if (global->netplay_enable) if (global->netplay_enable)
{ {
RARCH_WARN("Can't use overrides in conjunction with netplay, disabling overrides\n"); RARCH_WARN("Can't use overrides in conjunction with netplay, disabling overrides\n");
return false; return false;
} }
#endif
char buf[PATH_MAX_LENGTH]; char buf[PATH_MAX_LENGTH];
//Store the libretro_path we're using since it will be overwritten by the override when reloading //Store the libretro_path we're using since it will be overwritten by the override when reloading
strlcpy(buf,settings->libretro,sizeof(buf)); strlcpy(buf,settings->libretro,sizeof(buf));
if (config_load_file(global->config_path, false)) if (config_load_file(global->config_path, false))
{ {
//Restore the libretro_path we're using since it will be overwritten by the override when reloading //Restore the libretro_path we're using since it will be overwritten by the override when reloading
strlcpy(settings->libretro,buf,sizeof(settings->libretro)); strlcpy(settings->libretro,buf,sizeof(settings->libretro));
rarch_main_msg_queue_push("Configuration override loaded", 1, 100, true); rarch_main_msg_queue_push("Configuration override loaded", 1, 100, true);
return true; return true;
} }
} }
return false; return false;