summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorAnthony Serna <aserna3@gmail.com>2016-08-19 23:14:56 -0500
committerAnthony Serna <aserna3@gmail.com>2016-08-19 23:14:56 -0500
commit9e40fa2657446e33aaa4dd5fff438ceeedf43fb5 (patch)
treea45069e7daf525ea9fb7db19bee8ab222fda6124 /Source/Core
parentf1964f90d647251b677b3de29d08c4c22ea5344a (diff)
[Hotkey] Added custom textures toggle
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Core/HotkeyManager.cpp1
-rw-r--r--Source/Core/Core/HotkeyManager.h1
-rw-r--r--Source/Core/DolphinWX/Frame.cpp2
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))
{