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 #1932 from Buddybenj/freelook 

Fix Default Freelook Hotkey to Match Description (For Real This Time)
This commit is contained in:
Ryan Houdek 2015-01-21 13:41:29 -06:00
parent 50d495b581 9291d61d98
commit 4c9fd63562
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/CoreParameter.h
View File

@ -47,8 +47,8 @@ enum Hotkey
HK_DECREASE_FRAME_LIMIT, HK_DECREASE_FRAME_LIMIT,
HK_INCREASE_FRAME_LIMIT, HK_INCREASE_FRAME_LIMIT,
HK_FREELOOK_INCREASE_SPEED,
HK_FREELOOK_DECREASE_SPEED, HK_FREELOOK_DECREASE_SPEED,
HK_FREELOOK_INCREASE_SPEED,
HK_FREELOOK_RESET_SPEED, HK_FREELOOK_RESET_SPEED,
HK_FREELOOK_UP, HK_FREELOOK_UP,
HK_FREELOOK_DOWN, HK_FREELOOK_DOWN,

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

@ -983,8 +983,8 @@ int GetCmdForHotkey(unsigned int key)
case HK_SAVE_STATE_SLOT_SELECTED: return IDM_SAVE_SELECTED_SLOT; case HK_SAVE_STATE_SLOT_SELECTED: return IDM_SAVE_SELECTED_SLOT;
case HK_LOAD_STATE_SLOT_SELECTED: return IDM_LOAD_SELECTED_SLOT; case HK_LOAD_STATE_SLOT_SELECTED: return IDM_LOAD_SELECTED_SLOT;
case HK_FREELOOK_INCREASE_SPEED: return IDM_FREELOOK_INCREASE_SPEED;
case HK_FREELOOK_DECREASE_SPEED: return IDM_FREELOOK_DECREASE_SPEED; case HK_FREELOOK_DECREASE_SPEED: return IDM_FREELOOK_DECREASE_SPEED;
case HK_FREELOOK_INCREASE_SPEED: return IDM_FREELOOK_INCREASE_SPEED;
case HK_FREELOOK_RESET_SPEED: return IDM_FREELOOK_RESET_SPEED; case HK_FREELOOK_RESET_SPEED: return IDM_FREELOOK_RESET_SPEED;
case HK_FREELOOK_LEFT: return IDM_FREELOOK_LEFT; case HK_FREELOOK_LEFT: return IDM_FREELOOK_LEFT;
case HK_FREELOOK_RIGHT: return IDM_FREELOOK_RIGHT; case HK_FREELOOK_RIGHT: return IDM_FREELOOK_RIGHT;
@ -1217,10 +1217,10 @@ void CFrame::OnKeyDown(wxKeyEvent& event)
{ {
static float debugSpeed = 1.0f; static float debugSpeed = 1.0f;
if (IsHotkey(event, HK_FREELOOK_INCREASE_SPEED)) if (IsHotkey(event, HK_FREELOOK_DECREASE_SPEED))
debugSpeed *= 2.0f;
else if (IsHotkey(event, HK_FREELOOK_DECREASE_SPEED))
debugSpeed /= 2.0f; debugSpeed /= 2.0f;
else if (IsHotkey(event, HK_FREELOOK_INCREASE_SPEED))
debugSpeed *= 2.0f;
else if (IsHotkey(event, HK_FREELOOK_RESET_SPEED)) else if (IsHotkey(event, HK_FREELOOK_RESET_SPEED))
debugSpeed = 1.0f; debugSpeed = 1.0f;
else if (IsHotkey(event, HK_FREELOOK_UP)) else if (IsHotkey(event, HK_FREELOOK_UP))

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

@ -287,8 +287,8 @@ enum
IDM_MPANEL, ID_STATUSBAR, IDM_MPANEL, ID_STATUSBAR,
IDM_FREELOOK_INCREASE_SPEED,
IDM_FREELOOK_DECREASE_SPEED, IDM_FREELOOK_DECREASE_SPEED,
IDM_FREELOOK_INCREASE_SPEED,
IDM_FREELOOK_RESET_SPEED, IDM_FREELOOK_RESET_SPEED,
IDM_FREELOOK_UP, IDM_FREELOOK_UP,
IDM_FREELOOK_DOWN, IDM_FREELOOK_DOWN,

2
Source/Core/DolphinWX/HotkeyDlg.cpp
View File

@ -231,8 +231,8 @@ void HotkeyConfigDialog::CreateHotkeyGUIControls()
_("Decrease Frame limit"), _("Decrease Frame limit"),
_("Increase Frame limit"), _("Increase Frame limit"),
_("Freelook Increase Speed"),
_("Freelook Decrease Speed"), _("Freelook Decrease Speed"),
_("Freelook Increase Speed"),
_("Freelook Reset Speed"), _("Freelook Reset Speed"),
_("Freelook Move Up"), _("Freelook Move Up"),
_("Freelook Move Down"), _("Freelook Move Down"),