diff options
| author | Mat M <mathew1800@gmail.com> | 2018-08-09 04:51:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-09 04:51:29 -0400 |
| commit | bb255d266635f4a39d616c35b4670a7bb7dde795 (patch) | |
| tree | b80b35fb7878b215c9fb814f89a7a8613ed15552 /Source | |
| parent | 74057ec222be05ee361a9adb227e6b8b388f4144 (diff) | |
| parent | 2a2a2cfc5e23a4ba2df8480a8a1f1dc8262c955f (diff) | |
Merge pull request #7309 from JosJuice/remove-frameskip-even-more
ConfigManager: Remove m_FrameSkip
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Core/ConfigManager.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/Core/ConfigManager.h | 1 | ||||
| -rw-r--r-- | Source/Core/DolphinQt/HotkeyScheduler.cpp | 10 |
3 files changed, 5 insertions, 8 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; 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)) |