preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-11-12 00:59:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Config: Store the alternative speeds in percent

Browse Source 
The settings screen showed them in percent but they were stored as frame
rates out of 60, so the screen kept converted copies and wrote them back. Now
they're stored in percent under new ini keys (AltSpeedPercent,
AltSpeedPercent2, AnalogAltSpeedPercent), migrated from the old frame rate
keys like the audio volumes were, and converted to a frame rate where the
timing needs one.

Low percentages no longer round to a 0 fps limit, which meant unlimited.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
Henrik RydgårdandClaude Opus 5.5 committed 2026-10-22 15:28:18 +02:00
1 parent ff3d184b43
commit 71b38e58e6
6 files changed
+54 -34
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

UI/EmuScreen.cpp
+8 -8
View File
@@ -697,14 +697,14 @@ void EmuScreen::sendMessage(UIMessage message, const char *value) {
// TODO: We should replace the "fpsLimit" system with a speed factor.
static void ShowFpsLimitNotice() {
int fpsLimit = 60;
int percent = 100;
switch (PSP_CoreParameter().fpsLimit) {
case FPSLimit::CUSTOM1:
fpsLimit = g_Config.iFpsLimit1;
percent = g_Config.iAltSpeedPercent1;
break;
case FPSLimit::CUSTOM2:
fpsLimit = g_Config.iFpsLimit2;
percent = g_Config.iAltSpeedPercent2;
break;
default:
break;
@@ -713,7 +713,7 @@ static void ShowFpsLimitNotice() {
// Now display it.
char temp[51];
snprintf(temp, sizeof(temp), "%d%%", (int)((float)fpsLimit / 60.0f * 100.0f));
snprintf(temp, sizeof(temp), "%d%%", percent);
g_OSD.Show(OSDType::STATUS_ICON, temp, "", "I_FAST_FORWARD", 1.5f, "altspeed");
g_OSD.SetFlags("altspeed", OSDMessageFlags::Transparent);
}
@@ -994,9 +994,9 @@ void EmuScreen::ProcessVKey(VirtKey virtKey, bool down) {
if (down) {
if (!NetworkWarnUserIfOnlineAndCantSpeed()) {
// Cycle through enabled speeds.
if (PSP_CoreParameter().fpsLimit == FPSLimit::NORMAL && g_Config.iFpsLimit1 >= 0) {
if (PSP_CoreParameter().fpsLimit == FPSLimit::NORMAL && g_Config.iAltSpeedPercent1 >= 0) {
PSP_CoreParameter().fpsLimit = FPSLimit::CUSTOM1;
} else if (PSP_CoreParameter().fpsLimit == FPSLimit::CUSTOM1 && g_Config.iFpsLimit2 >= 0) {
} else if (PSP_CoreParameter().fpsLimit == FPSLimit::CUSTOM1 && g_Config.iAltSpeedPercent2 >= 0) {
PSP_CoreParameter().fpsLimit = FPSLimit::CUSTOM2;
} else if (PSP_CoreParameter().fpsLimit == FPSLimit::CUSTOM1 || PSP_CoreParameter().fpsLimit == FPSLimit::CUSTOM2) {
PSP_CoreParameter().fpsLimit = FPSLimit::NORMAL;
@@ -1145,7 +1145,7 @@ void EmuScreen::OnVKeyAnalog(VirtKey virtualKeyCode, float value) {
if (limitMode != FPSLimit::NORMAL && limitMode != FPSLimit::ANALOG)
return;
// Don't even try if the limit is invalid.
if (g_Config.iAnalogFpsLimit <= 0)
if (g_Config.iAnalogAltSpeedPercent <= 0)
return;
// Apply a small deadzone (against the resting position.)
@@ -1153,7 +1153,7 @@ void EmuScreen::OnVKeyAnalog(VirtKey virtualKeyCode, float value) {
// If target is above 60, value is how much to speed up over 60. Otherwise, it's how much slower.
// So normalize the target.
int target = g_Config.iAnalogFpsLimit - 60;
int target = AltSpeedPercentToFps(g_Config.iAnalogAltSpeedPercent) - 60;
PSP_CoreParameter().analogFpsLimit = 60 + (int)(target * value);
// If we've reset back to normal, turn it off.