Merge pull request #11187 from unknownbrackets/alt-speed

Add second alternate speed and buttons for alt speed
This commit is contained in:
Henrik Rydgård authored and GitHub committed 2018-06-24 13:41:12 +02:00
commit 4cfc6ee272
71 files changed
+697 -634

No files matched your search

+2 -5
View File
@@ -20,6 +20,7 @@
#include "GPU/Common/PostShader.h"
#include "GPU/GLES/FramebufferManagerGLES.h"
#include "Core/Config.h"
#include "Core/ConfigValues.h"
#include "Core/FileSystems/MetaFileSystem.h"
#include "UI/OnScreenDisplay.h"
#include "Windows/MainWindowMenu.h"
@@ -516,10 +517,6 @@ namespace MainWindow {
NativeMessageReceived("gpu_resized", "");
}
static void setFpsLimit(int fps) {
g_Config.iFpsLimit = fps;
}
static void setFrameSkipping(int framesToSkip = -1) {
if (framesToSkip >= FRAMESKIP_OFF)
g_Config.iFrameSkip = framesToSkip;
@@ -1066,7 +1063,7 @@ namespace MainWindow {
CHECKITEM(ID_OPTIONS_VERTEXCACHE, g_Config.bVertexCache);
CHECKITEM(ID_OPTIONS_SHOWFPS, g_Config.iShowFPSCounter);
CHECKITEM(ID_OPTIONS_FRAMESKIP_AUTO, g_Config.bAutoFrameSkip);
CHECKITEM(ID_OPTIONS_FRAMESKIP, g_Config.iFrameSkip != 0);
CHECKITEM(ID_OPTIONS_FRAMESKIP, g_Config.iFrameSkip != FRAMESKIP_OFF);
CHECKITEM(ID_OPTIONS_VSYNC, g_Config.bVSync);
CHECKITEM(ID_OPTIONS_TOPMOST, g_Config.bTopMost);
CHECKITEM(ID_OPTIONS_PAUSE_FOCUS, g_Config.bPauseOnLostFocus);