summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/FrameTools.cpp
diff options
context:
space:
mode:
authorMarkus Wick <degasus@users.noreply.github.com>2016-10-08 21:41:43 +0200
committerGitHub <noreply@github.com>2016-10-08 21:41:43 +0200
commita86b2c15d8a3064228e5b8fabf6cbea09c3837dd (patch)
treeea24ab15bce008fed82f21fda86d4e1b97cc8f44 /Source/Core/DolphinWX/FrameTools.cpp
parent8b38d5a1155c9d91036935b2abc388aaa1822e41 (diff)
parentb427ead0cc46ae6e35568a85228f6261204a197f (diff)
Merge pull request #4322 from Helios747/I_hate_features
Remove Frameskip
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
-rw-r--r--Source/Core/DolphinWX/FrameTools.cpp15
1 files changed, 0 insertions, 15 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp
index ecc692f113..f2c47fdb8e 100644
--- a/Source/Core/DolphinWX/FrameTools.cpp
+++ b/Source/Core/DolphinWX/FrameTools.cpp
@@ -135,13 +135,6 @@ wxMenuBar* CFrame::CreateMenu()
emulationMenu->Append(IDM_TOGGLE_FULLSCREEN, GetMenuLabel(HK_FULLSCREEN));
emulationMenu->Append(IDM_FRAMESTEP, GetMenuLabel(HK_FRAME_ADVANCE), wxEmptyString);
- wxMenu* skippingMenu = new wxMenu;
- emulationMenu->AppendSubMenu(skippingMenu, _("Frame S&kipping"));
- for (int i = 0; i < 10; i++)
- skippingMenu->AppendRadioItem(IDM_FRAME_SKIP_0 + i, wxString::Format("%i", i));
- skippingMenu->Check(IDM_FRAME_SKIP_0 + SConfig::GetInstance().m_FrameSkip, true);
- Movie::SetFrameSkipping(SConfig::GetInstance().m_FrameSkip);
-
emulationMenu->AppendSeparator();
emulationMenu->Append(IDM_SCREENSHOT, GetMenuLabel(HK_SCREENSHOT));
@@ -1643,14 +1636,6 @@ void CFrame::OnSaveState(wxCommandEvent& event)
}
}
-void CFrame::OnFrameSkip(wxCommandEvent& event)
-{
- int amount = event.GetId() - IDM_FRAME_SKIP_0;
-
- Movie::SetFrameSkipping((unsigned int)amount);
- SConfig::GetInstance().m_FrameSkip = amount;
-}
-
void CFrame::OnSelectSlot(wxCommandEvent& event)
{
m_saveSlot = event.GetId() - IDM_SELECT_SLOT_1 + 1;