From 9291d61d98c9f4840e8c24ca255c1f78a7e7928e Mon Sep 17 00:00:00 2001 From: Benjamin Przybocki Date: Tue, 20 Jan 2015 16:35:20 -0600 Subject: [PATCH] Fix Default Freelook Hotkey to Match Description (For Real This Time) --- Source/Core/Core/CoreParameter.h | 2 +- Source/Core/DolphinWX/Frame.cpp | 8 ++++---- Source/Core/DolphinWX/Globals.h | 2 +- Source/Core/DolphinWX/HotkeyDlg.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Source/Core/Core/CoreParameter.h b/Source/Core/Core/CoreParameter.h index 0df237bc65..68b9a67a95 100644 --- a/Source/Core/Core/CoreParameter.h +++ b/Source/Core/Core/CoreParameter.h @@ -47,8 +47,8 @@ enum Hotkey HK_INCREASE_FRAME_LIMIT, HK_DECREASE_FRAME_LIMIT, - HK_FREELOOK_INCREASE_SPEED, HK_FREELOOK_DECREASE_SPEED, + HK_FREELOOK_INCREASE_SPEED, HK_FREELOOK_RESET_SPEED, HK_FREELOOK_UP, HK_FREELOOK_DOWN, diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 214da46b02..412ea80eb9 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -978,8 +978,8 @@ int GetCmdForHotkey(unsigned int key) case HK_SAVE_STATE_SLOT_SELECTED: return IDM_SAVE_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_INCREASE_SPEED: return IDM_FREELOOK_INCREASE_SPEED; case HK_FREELOOK_RESET_SPEED: return IDM_FREELOOK_RESET_SPEED; case HK_FREELOOK_LEFT: return IDM_FREELOOK_LEFT; case HK_FREELOOK_RIGHT: return IDM_FREELOOK_RIGHT; @@ -1212,10 +1212,10 @@ void CFrame::OnKeyDown(wxKeyEvent& event) { static float debugSpeed = 1.0f; - if (IsHotkey(event, HK_FREELOOK_INCREASE_SPEED)) - debugSpeed *= 2.0f; - else if (IsHotkey(event, HK_FREELOOK_DECREASE_SPEED)) + if (IsHotkey(event, HK_FREELOOK_DECREASE_SPEED)) debugSpeed /= 2.0f; + else if (IsHotkey(event, HK_FREELOOK_INCREASE_SPEED)) + debugSpeed *= 2.0f; else if (IsHotkey(event, HK_FREELOOK_RESET_SPEED)) debugSpeed = 1.0f; else if (IsHotkey(event, HK_FREELOOK_UP)) diff --git a/Source/Core/DolphinWX/Globals.h b/Source/Core/DolphinWX/Globals.h index d95bb64bae..fe888d222d 100644 --- a/Source/Core/DolphinWX/Globals.h +++ b/Source/Core/DolphinWX/Globals.h @@ -287,8 +287,8 @@ enum IDM_MPANEL, ID_STATUSBAR, - IDM_FREELOOK_INCREASE_SPEED, IDM_FREELOOK_DECREASE_SPEED, + IDM_FREELOOK_INCREASE_SPEED, IDM_FREELOOK_RESET_SPEED, IDM_FREELOOK_UP, IDM_FREELOOK_DOWN, diff --git a/Source/Core/DolphinWX/HotkeyDlg.cpp b/Source/Core/DolphinWX/HotkeyDlg.cpp index c3f620adac..bc49ed484d 100644 --- a/Source/Core/DolphinWX/HotkeyDlg.cpp +++ b/Source/Core/DolphinWX/HotkeyDlg.cpp @@ -231,8 +231,8 @@ void HotkeyConfigDialog::CreateHotkeyGUIControls() _("Increase Frame limit"), _("Decrease Frame limit"), - _("Freelook Increase Speed"), _("Freelook Decrease Speed"), + _("Freelook Increase Speed"), _("Freelook Reset Speed"), _("Freelook Move Up"), _("Freelook Move Down"),