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

Add hotkeys to increase/decrease the frame limit.

This commit is contained in:
Rachel Bryk 2013-07-30 19:25:12 -04:00
parent a33b1fcdc6
commit 44d17b5da5
4 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,6 +71,8 @@ static const struct {
{ "ToggleAspectRatio", 0, 0 /* wxMOD_NONE */ }, { "ToggleAspectRatio", 0, 0 /* wxMOD_NONE */ },
{ "ToggleEFBCopies", 0, 0 /* wxMOD_NONE */ }, { "ToggleEFBCopies", 0, 0 /* wxMOD_NONE */ },
{ "ToggleFog", 0, 0 /* wxMOD_NONE */ }, { "ToggleFog", 0, 0 /* wxMOD_NONE */ },
{ "IncreaseFrameLimit", 0, 0 /* wxMOD_NONE */ },
{ "DecreaseFrameLimit", 0, 0 /* wxMOD_NONE */ },
{ "LoadStateSlot1", 340 /* WXK_F1 */, 0 /* wxMOD_NONE */ }, { "LoadStateSlot1", 340 /* WXK_F1 */, 0 /* wxMOD_NONE */ },
{ "LoadStateSlot2", 341 /* WXK_F2 */, 0 /* wxMOD_NONE */ }, { "LoadStateSlot2", 341 /* WXK_F2 */, 0 /* wxMOD_NONE */ },
{ "LoadStateSlot3", 342 /* WXK_F3 */, 0 /* wxMOD_NONE */ }, { "LoadStateSlot3", 342 /* WXK_F3 */, 0 /* wxMOD_NONE */ },

11
Source/Core/Core/Src/CoreParameter.h
View File

@ -34,10 +34,13 @@ enum Hotkey
HK_WIIMOTE4_CONNECT, HK_WIIMOTE4_CONNECT,
HK_BALANCEBOARD_CONNECT, HK_BALANCEBOARD_CONNECT,
HK_INTERNAL_RES, HK_TOGGLE_IR,
HK_ASPECT_RATIO, HK_TOGGLE_AR,
HK_EFB_COPIES, HK_TOGGLE_EFBCOPIES,
HK_FOG, HK_TOGGLE_FOG,
HK_INCREASE_FRAME_LIMIT,
HK_DECREASE_FRAME_LIMIT,
HK_LOAD_STATE_SLOT_1, HK_LOAD_STATE_SLOT_1,
HK_LOAD_STATE_SLOT_2, HK_LOAD_STATE_SLOT_2,

18
Source/Core/DolphinWX/Src/Frame.cpp
View File

@ -846,20 +846,20 @@ void CFrame::OnKeyDown(wxKeyEvent& event)
WiimoteId = 3; WiimoteId = 3;
else if (IsHotkey(event, HK_BALANCEBOARD_CONNECT)) else if (IsHotkey(event, HK_BALANCEBOARD_CONNECT))
WiimoteId = 4; WiimoteId = 4;
if (IsHotkey(event, HK_INTERNAL_RES)) if (IsHotkey(event, HK_TOGGLE_IR))
{ {
OSDChoice = 1; OSDChoice = 1;
// Toggle native resolution // Toggle native resolution
if (++g_Config.iEFBScale > SCALE_4X) if (++g_Config.iEFBScale > SCALE_4X)
g_Config.iEFBScale = SCALE_AUTO; g_Config.iEFBScale = SCALE_AUTO;
} }
else if (IsHotkey(event, HK_ASPECT_RATIO)) else if (IsHotkey(event, HK_TOGGLE_AR))
{ {
OSDChoice = 2; OSDChoice = 2;
// Toggle aspect ratio // Toggle aspect ratio
g_Config.iAspectRatio = (g_Config.iAspectRatio + 1) & 3; g_Config.iAspectRatio = (g_Config.iAspectRatio + 1) & 3;
} }
else if (IsHotkey(event, HK_EFB_COPIES)) else if (IsHotkey(event, HK_TOGGLE_EFBCOPIES))
{ {
OSDChoice = 3; OSDChoice = 3;
// Toggle EFB copy // Toggle EFB copy
@ -873,11 +873,21 @@ void CFrame::OnKeyDown(wxKeyEvent& event)
g_Config.bCopyEFBToTexture = !g_Config.bCopyEFBToTexture; g_Config.bCopyEFBToTexture = !g_Config.bCopyEFBToTexture;
} }
} }
else if (IsHotkey(event, HK_FOG)) else if (IsHotkey(event, HK_TOGGLE_FOG))
{ {
OSDChoice = 4; OSDChoice = 4;
g_Config.bDisableFog = !g_Config.bDisableFog; g_Config.bDisableFog = !g_Config.bDisableFog;
} }
else if (IsHotkey(event, HK_INCREASE_FRAME_LIMIT))
{
if (++SConfig::GetInstance().m_Framelimit > 0x19)
SConfig::GetInstance().m_Framelimit = 0;
}
else if (IsHotkey(event, HK_DECREASE_FRAME_LIMIT))
{
if (--SConfig::GetInstance().m_Framelimit > 0x19)
SConfig::GetInstance().m_Framelimit = 0x19;
}
else else
{ {
unsigned int i = NUM_HOTKEYS; unsigned int i = NUM_HOTKEYS;

3
Source/Core/DolphinWX/Src/HotkeyDlg.cpp
View File

@ -186,10 +186,13 @@ void HotkeyConfigDialog::CreateHotkeyGUIControls(void)
_("Connect Wiimote 3"), _("Connect Wiimote 3"),
_("Connect Wiimote 4"), _("Connect Wiimote 4"),
_("Connect Balance Board"), _("Connect Balance Board"),
_("Toggle IR"), _("Toggle IR"),
_("Toggle Aspect Ratio"), _("Toggle Aspect Ratio"),
_("Toggle EFB Copies"), _("Toggle EFB Copies"),
_("Toggle Fog"), _("Toggle Fog"),
_("Increase Frame limit"),
_("Decrease Frame limit"),
_("Load State Slot 1"), _("Load State Slot 1"),
_("Load State Slot 2"), _("Load State Slot 2"),