Merge pull request #2757 from thedax/master

SpeedToggle button: Switch from tri-state to dual-state(standard/fixed).
hrydgard · Jul 11, 2013 · 415afa9 · 415afa9
2 parents 1fdebd5 + 9af456a
commit 415afa9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/GPU/GLES/DisplayListInterpreter.cpp b/GPU/GLES/DisplayListInterpreter.cpp
@@ -257,7 +257,7 @@ void GLES_GPU::DumpNextFrame() {
 void GLES_GPU::BeginFrame() {
 	// Turn off vsync when unthrottled
 	int desiredVSyncInterval = g_Config.iVSyncInterval;
-	if ((PSP_CoreParameter().unthrottle) || (PSP_CoreParameter().fpsLimit == 2) || (PSP_CoreParameter().fpsLimit == 1))
+	if ((PSP_CoreParameter().unthrottle) || (PSP_CoreParameter().fpsLimit == 1))
 		desiredVSyncInterval = 0;
 	if (desiredVSyncInterval != lastVsync_) {
 		if (gl_extensions.EXT_swap_control_tear) {

diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp
@@ -191,10 +191,6 @@ void EmuScreen::onVKeyDown(int virtualKeyCode) {
 			osm.Show(s->T("fixed", "Speed: fixed"), 1.0);
 		}
 		else if (PSP_CoreParameter().fpsLimit == 1) {
-			PSP_CoreParameter().fpsLimit = 2;
-			osm.Show(s->T("unlimited", "Speed: unlimited!"), 1.0, 0x50E0FF);
-		}
-		else if (PSP_CoreParameter().fpsLimit == 2) {
 			PSP_CoreParameter().fpsLimit = 0;
 			osm.Show(s->T("standard", "Speed: standard"), 1.0);
 		}
@@ -433,7 +429,7 @@ void EmuScreen::update(InputState &input) {
 	}
 
 	// Make sure fpsLimit starts at 0
-	if (PSP_CoreParameter().fpsLimit != 0 && PSP_CoreParameter().fpsLimit != 1 && PSP_CoreParameter().fpsLimit != 2) {
+	if (PSP_CoreParameter().fpsLimit != 0 && PSP_CoreParameter().fpsLimit != 1) {
 		PSP_CoreParameter().fpsLimit = 0;
 	}