ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7309 from JosJuice/remove-frameskip-even-more 

ConfigManager: Remove m_FrameSkip
This commit is contained in:
Mat M 2018-08-09 04:51:29 -04:00 committed by GitHub
parent 74057ec222 2a2a2cfc5e
commit bb255d2666
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/ConfigManager.cpp
View File

@ -246,7 +246,6 @@ void SConfig::SaveCoreSettings(IniFile& ini)
core->Set("RunCompareServer", bRunCompareServer); core->Set("RunCompareServer", bRunCompareServer);
core->Set("RunCompareClient", bRunCompareClient); core->Set("RunCompareClient", bRunCompareClient);
core->Set("EmulationSpeed", m_EmulationSpeed); core->Set("EmulationSpeed", m_EmulationSpeed);
core->Set("FrameSkip", m_FrameSkip);
core->Set("Overclock", m_OCFactor); core->Set("Overclock", m_OCFactor);
core->Set("OverclockEnable", m_OCEnable); core->Set("OverclockEnable", m_OCEnable);
core->Set("GFXBackend", m_strVideoBackend); core->Set("GFXBackend", m_strVideoBackend);
@ -535,7 +534,6 @@ void SConfig::LoadCoreSettings(IniFile& ini)
core->Get("EmulationSpeed", &m_EmulationSpeed, 1.0f); core->Get("EmulationSpeed", &m_EmulationSpeed, 1.0f);
core->Get("Overclock", &m_OCFactor, 1.0f); core->Get("Overclock", &m_OCFactor, 1.0f);
core->Get("OverclockEnable", &m_OCEnable, false); core->Get("OverclockEnable", &m_OCEnable, false);
core->Get("FrameSkip", &m_FrameSkip, 0);
core->Get("GFXBackend", &m_strVideoBackend, ""); core->Get("GFXBackend", &m_strVideoBackend, "");
core->Get("GPUDeterminismMode", &m_strGPUDeterminismMode, "auto"); core->Get("GPUDeterminismMode", &m_strGPUDeterminismMode, "auto");
core->Get("PerfMapDir", &m_perfDir, ""); core->Get("PerfMapDir", &m_perfDir, "");

1
Source/Core/Core/ConfigManager.h
View File

@ -277,7 +277,6 @@ struct SConfig
bool m_ShowFrameCount; bool m_ShowFrameCount;
bool m_ShowRTC; bool m_ShowRTC;
std::string m_strMovieAuthor; std::string m_strMovieAuthor;
unsigned int m_FrameSkip;
bool m_DumpFrames; bool m_DumpFrames;
bool m_DumpFramesSilent; bool m_DumpFramesSilent;
bool m_ShowInputDisplay; bool m_ShowInputDisplay;

10
Source/Core/DolphinQt/HotkeyScheduler.cpp
View File

@ -63,9 +63,9 @@ static bool IsHotkey(int id, bool held = false)
return HotkeyManagerEmu::IsPressed(id, held); 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; constexpr int FRAME_STEP_DELAY = 30;
static int frame_step_count = 0; static int frame_step_count = 0;
@ -75,7 +75,7 @@ static void HandleFrameskipHotkeys()
if (IsHotkey(HK_FRAME_ADVANCE_INCREASE_SPEED)) 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; return;
} }
@ -181,8 +181,8 @@ void HotkeyScheduler::Run()
if (IsHotkey(HK_RESET)) if (IsHotkey(HK_RESET))
emit ResetHotkey(); emit ResetHotkey();
// Frameskipping // Frame advance
HandleFrameskipHotkeys(); HandleFrameStepHotkeys();
// Screenshot // Screenshot
if (IsHotkey(HK_SCREENSHOT)) if (IsHotkey(HK_SCREENSHOT))