Move overclock-related variables to ppu instead

Just makes more sense since overclocking is ppu-based.
This commit is contained in:
negativeExponent
2021-06-03 10:50:22 +08:00
parent 46ca02a206
commit f6cc87a8fa
6 changed files with 52 additions and 46 deletions

View File

@@ -1223,33 +1223,33 @@ static void check_variables(bool startup)
bool do_reinit = false;
if (!strcmp(var.value, "disabled")
&& FSettings.overclock_enabled != 0)
&& ppu.overclock_enabled != 0)
{
FSettings.skip_7bit_overclocking = 1;
FSettings.extrascanlines = 0;
FSettings.vblankscanlines = 0;
FSettings.overclock_enabled = 0;
ppu.skip_7bit_overclocking = 1;
ppu.extrascanlines = 0;
ppu.vblankscanlines = 0;
ppu.overclock_enabled = 0;
do_reinit = true;
}
else if (!strcmp(var.value, "2x-Postrender"))
{
FSettings.skip_7bit_overclocking = 1;
FSettings.extrascanlines = 266;
FSettings.vblankscanlines = 0;
FSettings.overclock_enabled = 1;
ppu.skip_7bit_overclocking = 1;
ppu.extrascanlines = 266;
ppu.vblankscanlines = 0;
ppu.overclock_enabled = 1;
do_reinit = true;
}
else if (!strcmp(var.value, "2x-VBlank"))
{
FSettings.skip_7bit_overclocking = 1;
FSettings.extrascanlines = 0;
FSettings.vblankscanlines = 266;
FSettings.overclock_enabled = 1;
ppu.skip_7bit_overclocking = 1;
ppu.extrascanlines = 0;
ppu.vblankscanlines = 266;
ppu.overclock_enabled = 1;
do_reinit = true;
}
FSettings.normal_scanlines = FSettings.dendy ? SCANLINES_DENDY : SCANLINES_NORMAL;
FSettings.totalscanlines = FSettings.normal_scanlines + (FSettings.overclock_enabled ? FSettings.extrascanlines : 0);
ppu.normal_scanlines = FSettings.dendy ? SCANLINES_DENDY : SCANLINES_NORMAL;
ppu.totalscanlines = ppu.normal_scanlines + (ppu.overclock_enabled ? ppu.extrascanlines : 0);
if (do_reinit && startup)
{