summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/Frame.cpp
diff options
context:
space:
mode:
authorskidau <skidau@gmail.com>2015-02-28 16:40:24 +1100
committerskidau <skidau@gmail.com>2015-03-08 20:27:12 +1100
commitd2abbcd3533d3b0db6ff2194509c742fa1b33df8 (patch)
tree4dbe849c315c4efbd9cb22df87f14e22d29a9300 /Source/Core/DolphinWX/Frame.cpp
parentd080632527de87eb39296bef5e77d05256f48643 (diff)
Removed the requirement to have the Freelook option enabled for the freelook hotkeys to work.
Diffstat (limited to 'Source/Core/DolphinWX/Frame.cpp')
-rw-r--r--Source/Core/DolphinWX/Frame.cpp47
1 files changed, 22 insertions, 25 deletions
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp
index 56a6d7402e..be2f0c68dc 100644
--- a/Source/Core/DolphinWX/Frame.cpp
+++ b/Source/Core/DolphinWX/Frame.cpp
@@ -1440,30 +1440,27 @@ void CFrame::ParseHotkeys(wxKeyEvent &event)
OnConnectWiimote(evt);
}
- if (g_Config.bFreeLook)
- {
- static float debugSpeed = 1.0f;
-
- 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))
- VertexShaderManager::TranslateView(0.0f, 0.0f, -debugSpeed);
- else if (IsHotkey(event, HK_FREELOOK_DOWN))
- VertexShaderManager::TranslateView(0.0f, 0.0f, debugSpeed);
- else if (IsHotkey(event, HK_FREELOOK_LEFT))
- VertexShaderManager::TranslateView(debugSpeed, 0.0f);
- else if (IsHotkey(event, HK_FREELOOK_RIGHT))
- VertexShaderManager::TranslateView(-debugSpeed, 0.0f);
- else if (IsHotkey(event, HK_FREELOOK_ZOOM_IN))
- VertexShaderManager::TranslateView(0.0f, debugSpeed);
- else if (IsHotkey(event, HK_FREELOOK_ZOOM_OUT))
- VertexShaderManager::TranslateView(0.0f, -debugSpeed);
- else if (IsHotkey(event, HK_FREELOOK_RESET))
- VertexShaderManager::ResetView();
- }
+ static float debugSpeed = 1.0f;
+
+ 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))
+ VertexShaderManager::TranslateView(0.0f, 0.0f, -debugSpeed);
+ else if (IsHotkey(event, HK_FREELOOK_DOWN))
+ VertexShaderManager::TranslateView(0.0f, 0.0f, debugSpeed);
+ else if (IsHotkey(event, HK_FREELOOK_LEFT))
+ VertexShaderManager::TranslateView(debugSpeed, 0.0f);
+ else if (IsHotkey(event, HK_FREELOOK_RIGHT))
+ VertexShaderManager::TranslateView(-debugSpeed, 0.0f);
+ else if (IsHotkey(event, HK_FREELOOK_ZOOM_IN))
+ VertexShaderManager::TranslateView(0.0f, debugSpeed);
+ else if (IsHotkey(event, HK_FREELOOK_ZOOM_OUT))
+ VertexShaderManager::TranslateView(0.0f, -debugSpeed);
+ else if (IsHotkey(event, HK_FREELOOK_RESET))
+ VertexShaderManager::ResetView();
}
}