Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-12-03 19:21:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #17706 from hrydgard/fix-alternate-speed

Browse Source 
Unlimited alternate speed got broken in recent changes.
This commit is contained in:
Henrik Rydgård 2023-07-12 23:20:59 +02:00 committed by GitHub
commit d5944ca68d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Core/HLE/sceDisplay.cpp
View File

@ -351,14 +351,22 @@ void __DisplaySetWasPaused() {
static int FrameTimingLimit() {
bool challenge = Achievements::ChallengeModeActive();
auto fixRate = [=](int limit) {
int minRate = challenge ? 60 : 1;
if (limit != 0) {
return std::max(limit, minRate);
} else {
return limit;
}
};
// Can't slow down in challenge mode.
int minRate = challenge ? 60 : 1;
if (PSP_CoreParameter().fpsLimit == FPSLimit::CUSTOM1)
return std::max(g_Config.iFpsLimit1, minRate);
return fixRate(g_Config.iFpsLimit1);
if (PSP_CoreParameter().fpsLimit == FPSLimit::CUSTOM2)
return std::max(g_Config.iFpsLimit2, minRate);
return fixRate(g_Config.iFpsLimit2);
if (PSP_CoreParameter().fpsLimit == FPSLimit::ANALOG)
return std::max(PSP_CoreParameter().analogFpsLimit, minRate);
return fixRate(PSP_CoreParameter().analogFpsLimit);
// Note: Fast-forward is OK in challenge mode.
if (PSP_CoreParameter().fastForward)
return 0;