Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Setting unlimited as an alternate speed is possible again.

Browse source
This commit is contained in:
Henrik Rydgard 2013-08-18 22:48:53 +02:00
parent a48e1de2d4
commit 00d56e6bcf
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Core/HLE/sceDisplay.cpp
View file

@ -309,6 +309,8 @@ enum {
void DoFrameTiming(bool &throttle, bool &skipFrame, float timestep) {
int fpsLimiter = PSP_CoreParameter().fpsLimit;
throttle = !PSP_CoreParameter().unthrottle;
if (fpsLimiter == FPS_LIMIT_CUSTOM && g_Config.iFpsLimit == 0)
throttle = false;
skipFrame = false;
// Check if the frameskipping code should be enabled. If neither throttling or frameskipping is on,
@ -340,7 +342,7 @@ void DoFrameTiming(bool &throttle, bool &skipFrame, float timestep) {
// Argh, we are falling behind! Let's skip a frame and see if we catch up.
// Auto-frameskip automatically if speed limit is set differently than the default.
if (g_Config.iFrameSkip == 1 || (g_Config.iFrameSkip == 0 && fpsLimiter == FPS_LIMIT_CUSTOM)) {
if (g_Config.iFrameSkip == 1 || (g_Config.iFrameSkip == 0 && fpsLimiter == FPS_LIMIT_CUSTOM && g_Config.iFpsLimit > 60)) {
// 1 == autoframeskip
if (curFrameTime > nextFrameTime && doFrameSkip) {
skipFrame = true;

6
UI/GameSettingsScreen.cpp
View file

@ -177,8 +177,8 @@ void PopupSliderChoiceFloat::Draw(UIContext &dc) {
}
static const int alternateSpeedTable[8] = {
15, 30, 45, 60, 75, 90, 120, 180
static const int alternateSpeedTable[9] = {
0, 15, 30, 45, 60, 75, 90, 120, 180
};
@ -242,7 +242,7 @@ void GameSettingsScreen::CreateViews() {
static const char *fpsChoices[] = {"None", "Speed", "FPS", "Both"};
graphicsSettings->Add(new CheckBox(&cap60FPS_, gs->T("Force 60 FPS or less (helps GoW)")));
static const char *customSpeed[] = {"25%", "50%", "75%", "100%", "125%", "150%", "200%", "300%"};
static const char *customSpeed[] = {"Unlimited", "25%", "50%", "75%", "100%", "125%", "150%", "200%", "300%"};
graphicsSettings->Add(new PopupMultiChoice(&iAlternateSpeedPercent_, gs->T("Alternative Speed"), customSpeed, 0, 8, 0, screenManager()));
graphicsSettings->Add(new ItemHeader(gs->T("Features")));