piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-31 10:09:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4322 from Helios747/I_hate_features

Browse Source 
Remove Frameskip
This commit is contained in:
Markus Wick
2016-10-08 21:41:43 +02:00
committed by GitHub
parent 8b38d5a115 b427ead0cc
commit a86b2c15d8
20 changed files with 83 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/DolphinWX/Frame.cpp
View File

@ -307,7 +307,6 @@ EVT_MENU_RANGE(IDM_LOAD_SLOT_1, IDM_LOAD_SLOT_10, CFrame::OnLoadState)
EVT_MENU_RANGE(IDM_LOAD_LAST_1, IDM_LOAD_LAST_10, CFrame::OnLoadLastState)
EVT_MENU_RANGE(IDM_SAVE_SLOT_1, IDM_SAVE_SLOT_10, CFrame::OnSaveState)
EVT_MENU_RANGE(IDM_SELECT_SLOT_1, IDM_SELECT_SLOT_10, CFrame::OnSelectSlot)
EVT_MENU_RANGE(IDM_FRAME_SKIP_0, IDM_FRAME_SKIP_9, CFrame::OnFrameSkip)
EVT_MENU_RANGE(IDM_DRIVE1, IDM_DRIVE24, CFrame::OnBootDrive)
EVT_MENU_RANGE(IDM_CONNECT_WIIMOTE1, IDM_CONNECT_BALANCEBOARD, CFrame::OnConnectWiimote)
EVT_MENU_RANGE(IDM_LIST_WAD, IDM_LIST_DRIVES, CFrame::GameListChanged)

1
Source/Core/DolphinWX/Frame.h
View File

@ -283,7 +283,6 @@ private:
void OnUndoLoadState(wxCommandEvent& event);
void OnUndoSaveState(wxCommandEvent& event);
void OnFrameSkip(wxCommandEvent& event);
void OnFrameStep(wxCommandEvent& event);
void OnConfigMain(wxCommandEvent& event); // Options

15
Source/Core/DolphinWX/FrameTools.cpp
View File

@ -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;

10
Source/Core/DolphinWX/Globals.h
View File

@ -73,16 +73,6 @@ enum
IDM_SELECT_SLOT_10,
IDM_SAVE_SELECTED_SLOT,
IDM_LOAD_SELECTED_SLOT,
IDM_FRAME_SKIP_0,
IDM_FRAME_SKIP_1,
IDM_FRAME_SKIP_2,
IDM_FRAME_SKIP_3,
IDM_FRAME_SKIP_4,
IDM_FRAME_SKIP_5,
IDM_FRAME_SKIP_6,
IDM_FRAME_SKIP_7,
IDM_FRAME_SKIP_8,
IDM_FRAME_SKIP_9,
IDM_PLAY,
IDM_STOP,
IDM_RESET,