From 2ee8a61148364c2c661a137bab7e3478ccb66cfc Mon Sep 17 00:00:00 2001 From: JosJuice Date: Thu, 9 Aug 2018 10:31:02 +0200 Subject: [PATCH 1/2] ConfigManager: Remove m_FrameSkip This setting was removed some time ago but was apparently still being read and written by ConfigManager. --- Source/Core/Core/ConfigManager.cpp | 2 -- Source/Core/Core/ConfigManager.h | 1 - 2 files changed, 3 deletions(-) diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp index f31ea26780..7a1e8cab4c 100644 --- a/Source/Core/Core/ConfigManager.cpp +++ b/Source/Core/Core/ConfigManager.cpp @@ -246,7 +246,6 @@ void SConfig::SaveCoreSettings(IniFile& ini) core->Set("RunCompareServer", bRunCompareServer); core->Set("RunCompareClient", bRunCompareClient); core->Set("EmulationSpeed", m_EmulationSpeed); - core->Set("FrameSkip", m_FrameSkip); core->Set("Overclock", m_OCFactor); core->Set("OverclockEnable", m_OCEnable); core->Set("GFXBackend", m_strVideoBackend); @@ -535,7 +534,6 @@ void SConfig::LoadCoreSettings(IniFile& ini) core->Get("EmulationSpeed", &m_EmulationSpeed, 1.0f); core->Get("Overclock", &m_OCFactor, 1.0f); core->Get("OverclockEnable", &m_OCEnable, false); - core->Get("FrameSkip", &m_FrameSkip, 0); core->Get("GFXBackend", &m_strVideoBackend, ""); core->Get("GPUDeterminismMode", &m_strGPUDeterminismMode, "auto"); core->Get("PerfMapDir", &m_perfDir, ""); diff --git a/Source/Core/Core/ConfigManager.h b/Source/Core/Core/ConfigManager.h index 0d6248e9ae..f39c9738c6 100644 --- a/Source/Core/Core/ConfigManager.h +++ b/Source/Core/Core/ConfigManager.h @@ -277,7 +277,6 @@ struct SConfig bool m_ShowFrameCount; bool m_ShowRTC; std::string m_strMovieAuthor; - unsigned int m_FrameSkip; bool m_DumpFrames; bool m_DumpFramesSilent; bool m_ShowInputDisplay; From 2a2a2cfc5e23a4ba2df8480a8a1f1dc8262c955f Mon Sep 17 00:00:00 2001 From: JosJuice Date: Thu, 9 Aug 2018 10:32:32 +0200 Subject: [PATCH 2/2] DolphinQt: Don't call "frame advance" "frame skip" Just to avoid confusion. --- Source/Core/DolphinQt/HotkeyScheduler.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Core/DolphinQt/HotkeyScheduler.cpp b/Source/Core/DolphinQt/HotkeyScheduler.cpp index ce0a23bce4..cd5c51822f 100644 --- a/Source/Core/DolphinQt/HotkeyScheduler.cpp +++ b/Source/Core/DolphinQt/HotkeyScheduler.cpp @@ -63,9 +63,9 @@ static bool IsHotkey(int id, bool held = false) return HotkeyManagerEmu::IsPressed(id, held); } -static void HandleFrameskipHotkeys() +static void HandleFrameStepHotkeys() { - constexpr int MAX_FRAME_SKIP_DELAY = 60; + constexpr int MAX_FRAME_STEP_DELAY = 60; constexpr int FRAME_STEP_DELAY = 30; static int frame_step_count = 0; @@ -75,7 +75,7 @@ static void HandleFrameskipHotkeys() if (IsHotkey(HK_FRAME_ADVANCE_INCREASE_SPEED)) { - frame_step_delay = std::min(frame_step_delay + 1, MAX_FRAME_SKIP_DELAY); + frame_step_delay = std::min(frame_step_delay + 1, MAX_FRAME_STEP_DELAY); return; } @@ -181,8 +181,8 @@ void HotkeyScheduler::Run() if (IsHotkey(HK_RESET)) emit ResetHotkey(); - // Frameskipping - HandleFrameskipHotkeys(); + // Frame advance + HandleFrameStepHotkeys(); // Screenshot if (IsHotkey(HK_SCREENSHOT))