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

Merge pull request #4680 from libretro/msr_temp 

patch_content - cleanup
This commit is contained in:
Twinaphex 2017-02-21 20:38:52 +01:00 committed by GitHub
parent 7c83071b01 ef5b26350d
commit d06273e38a
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tasks/task_patch.c
View File

@ -595,13 +595,16 @@ static void patch_content(
void *data) void *data)
{ {
ssize_t *size = (ssize_t*)data; ssize_t *size = (ssize_t*)data;
bool allow_ups = !rarch_ctl(RARCH_CTL_IS_BPS_PREF, NULL) && !rarch_ctl(RARCH_CTL_IS_IPS_PREF, NULL); bool is_ips_pref = rarch_ctl(RARCH_CTL_IS_IPS_PREF, NULL);
bool allow_ips = !rarch_ctl(RARCH_CTL_IS_UPS_PREF, NULL) && !rarch_ctl(RARCH_CTL_IS_BPS_PREF, NULL); bool is_bps_pref = rarch_ctl(RARCH_CTL_IS_BPS_PREF, NULL);
bool allow_bps = !rarch_ctl(RARCH_CTL_IS_UPS_PREF, NULL) && !rarch_ctl(RARCH_CTL_IS_IPS_PREF, NULL); bool is_ups_pref = rarch_ctl(RARCH_CTL_IS_UPS_PREF, NULL);
bool allow_ups = !is_bps_pref && !is_ips_pref;
bool allow_ips = !is_ups_pref && !is_bps_pref;
bool allow_bps = !is_ups_pref && !is_ips_pref;
if ( (unsigned)rarch_ctl(RARCH_CTL_IS_IPS_PREF, NULL) if ( (unsigned)is_ips_pref
+ (unsigned)rarch_ctl(RARCH_CTL_IS_BPS_PREF, NULL) + (unsigned)is_bps_pref
+ (unsigned)rarch_ctl(RARCH_CTL_IS_UPS_PREF, NULL) > 1) + (unsigned)is_ups_pref > 1)
{ {
RARCH_WARN("%s\n", RARCH_WARN("%s\n",
msg_hash_to_str(MSG_SEVERAL_PATCHES_ARE_EXPLICITLY_DEFINED)); msg_hash_to_str(MSG_SEVERAL_PATCHES_ARE_EXPLICITLY_DEFINED));