diff options
| author | hizzlekizzle | 2019-03-12 21:49:57 -0500 |
|---|---|---|
| committer | GitHub | 2019-03-12 21:49:57 -0500 |
| commit | 949ed5baf43dbb3ef3b51f43498f050e2d1e4c40 (patch) | |
| tree | 21c36156454215ff99d5e270e910fa998d9be606 /frontend | |
| parent | 5a49b8a2620bfdfaaf59ae25aa51bde44610371b (diff) | |
| parent | 1d6abe26ddb1f893cf96ccd3e251f25b1afbba2a (diff) | |
| download | pcsx_rearmed-949ed5baf43dbb3ef3b51f43498f050e2d1e4c40.tar.gz pcsx_rearmed-949ed5baf43dbb3ef3b51f43498f050e2d1e4c40.tar.bz2 pcsx_rearmed-949ed5baf43dbb3ef3b51f43498f050e2d1e4c40.zip | |
Merge pull request #244 from retro-wertz/sync_to_upstream
fetch new updates from upstream
Diffstat (limited to 'frontend')
| -rw-r--r-- | frontend/libretro.c | 12 | ||||
| -rw-r--r-- | frontend/main.c | 1 | ||||
| -rw-r--r-- | frontend/menu.c | 2 |
3 files changed, 15 insertions, 0 deletions
diff --git a/frontend/libretro.c b/frontend/libretro.c index a5ec2c2..06b66b1 100644 --- a/frontend/libretro.c +++ b/frontend/libretro.c @@ -500,6 +500,7 @@ void retro_set_environment(retro_environment_t cb) { "pcsx_rearmed_show_bios_bootlogo", "Show Bios Bootlogo(Breaks some games); disabled|enabled" }, { "pcsx_rearmed_spu_reverb", "Sound: Reverb; enabled|disabled" }, { "pcsx_rearmed_spu_interpolation", "Sound: Interpolation; simple|gaussian|cubic|off" }, + { "pcsx_rearmed_idiablofix", "Diablo Music Fix; disabled|enabled" }, { "pcsx_rearmed_pe2_fix", "Parasite Eve 2/Vandal Hearts 1/2 Fix; disabled|enabled" }, { "pcsx_rearmed_inuyasha_fix", "InuYasha Sengoku Battle Fix; disabled|enabled" }, { NULL, NULL }, @@ -1558,6 +1559,17 @@ static void update_variables(bool in_flight) } var.value = "NULL"; + var.key = "pcsx_rearmed_idiablofix"; + + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value) + { + if (strcmp(var.value, "disabled") == 0) + spu_config.idiablofix = 0; + else if (strcmp(var.value, "enabled") == 0) + spu_config.idiablofix = 1; + } + + var.value = "NULL"; var.key = "pcsx_rearmed_inuyasha_fix"; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value) diff --git a/frontend/main.c b/frontend/main.c index 2d438aa..860dec0 100644 --- a/frontend/main.c +++ b/frontend/main.c @@ -138,6 +138,7 @@ void emu_set_default_config(void) pl_rearmed_cbs.gpu_peopsgl.iTexGarbageCollection = 1; spu_config.iUseReverb = 1; + spu_config.idiablofix = 0; spu_config.iUseInterpolation = 1; spu_config.iXAPitch = 0; spu_config.iVolume = 768; diff --git a/frontend/menu.c b/frontend/menu.c index 0f59910..babe109 100644 --- a/frontend/menu.c +++ b/frontend/menu.c @@ -440,6 +440,7 @@ static const struct { CE_INTVAL_P(gpu_peopsgl.iTexGarbageCollection), CE_INTVAL_P(gpu_peopsgl.dwActFixes), CE_INTVAL(spu_config.iUseReverb), + CE_INTVAL(spu_config.idiablofix), CE_INTVAL(spu_config.iXAPitch), CE_INTVAL(spu_config.iUseInterpolation), CE_INTVAL(spu_config.iTempo), @@ -1451,6 +1452,7 @@ static menu_entry e_menu_plugin_spu[] = mee_range_h ("Volume boost", 0, volume_boost, -5, 30, h_spu_volboost), mee_onoff ("Reverb", 0, spu_config.iUseReverb, 1), mee_enum ("Interpolation", 0, spu_config.iUseInterpolation, men_spu_interp), + mee_onoff ("Diablo Music fix", 0, spu_config.idiablofix, 1), mee_onoff ("Adjust XA pitch", 0, spu_config.iXAPitch, 1), mee_onoff_h ("Adjust tempo", 0, spu_config.iTempo, 1, h_spu_tempo), mee_end, |