diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2016-08-22 16:59:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-22 16:59:01 +0200 |
| commit | 8d186a468fffaf73fe36f57d050e7370e37f91ca (patch) | |
| tree | d80fb8592cc91c604bc0f4c6e2fb935bb7f8e16a /Source | |
| parent | 8177eddd684880afeb416788ef8a917aca4f6854 (diff) | |
| parent | 9e40fa2657446e33aaa4dd5fff438ceeedf43fb5 (diff) | |
Merge pull request #4136 from Helios747/custom_textures_hotkey
[Hotkey] Added custom textures toggle
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Core/HotkeyManager.cpp | 1 | ||||
| -rw-r--r-- | Source/Core/Core/HotkeyManager.h | 1 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Frame.cpp | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/Source/Core/Core/HotkeyManager.cpp b/Source/Core/Core/HotkeyManager.cpp index b8fc387b3e..8e757384ab 100644 --- a/Source/Core/Core/HotkeyManager.cpp +++ b/Source/Core/Core/HotkeyManager.cpp @@ -50,6 +50,7 @@ const std::string hotkey_labels[] = { _trans("Toggle EFB Copies"), _trans("Toggle Fog"), _trans("Disable Emulation Speed Limit"), + _trans("Toggle Custom Textures"), _trans("Decrease Emulation Speed"), _trans("Increase Emulation Speed"), diff --git a/Source/Core/Core/HotkeyManager.h b/Source/Core/Core/HotkeyManager.h index 02b2e2df8b..b8934dd79d 100644 --- a/Source/Core/Core/HotkeyManager.h +++ b/Source/Core/Core/HotkeyManager.h @@ -49,6 +49,7 @@ enum Hotkey HK_TOGGLE_EFBCOPIES, HK_TOGGLE_FOG, HK_TOGGLE_THROTTLE, + HK_TOGGLE_TEXTURES, HK_DECREASE_EMULATION_SPEED, HK_INCREASE_EMULATION_SPEED, diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 28ef4c1386..5b0b8e1049 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -1497,6 +1497,8 @@ void CFrame::ParseHotkeys() OSDChoice = 4; g_Config.bDisableFog = !g_Config.bDisableFog; } + if (IsHotkey(HK_TOGGLE_TEXTURES)) + g_Config.bHiresTextures = !g_Config.bHiresTextures; Core::SetIsThrottlerTempDisabled(IsHotkey(HK_TOGGLE_THROTTLE, true)); if (IsHotkey(HK_DECREASE_EMULATION_SPEED)) { |