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 #4136 from Helios747/custom_textures_hotkey 

[Hotkey] Added custom textures toggle
This commit is contained in:
Markus Wick 2016-08-22 16:59:01 +02:00 committed by GitHub
parent 8177eddd68 9e40fa2657
commit 8d186a468f
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Core/HotkeyManager.cpp
View File

@ -50,6 +50,7 @@ const std::string hotkey_labels[] = {
_trans("Toggle EFB Copies"), _trans("Toggle EFB Copies"),
_trans("Toggle Fog"), _trans("Toggle Fog"),
_trans("Disable Emulation Speed Limit"), _trans("Disable Emulation Speed Limit"),
_trans("Toggle Custom Textures"),
_trans("Decrease Emulation Speed"), _trans("Decrease Emulation Speed"),
_trans("Increase Emulation Speed"), _trans("Increase Emulation Speed"),

1
Source/Core/Core/HotkeyManager.h
View File

@ -49,6 +49,7 @@ enum Hotkey
HK_TOGGLE_EFBCOPIES, HK_TOGGLE_EFBCOPIES,
HK_TOGGLE_FOG, HK_TOGGLE_FOG,
HK_TOGGLE_THROTTLE, HK_TOGGLE_THROTTLE,
HK_TOGGLE_TEXTURES,
HK_DECREASE_EMULATION_SPEED, HK_DECREASE_EMULATION_SPEED,
HK_INCREASE_EMULATION_SPEED, HK_INCREASE_EMULATION_SPEED,

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

@ -1497,6 +1497,8 @@ void CFrame::ParseHotkeys()
OSDChoice = 4; OSDChoice = 4;
g_Config.bDisableFog = !g_Config.bDisableFog; g_Config.bDisableFog = !g_Config.bDisableFog;
} }
if (IsHotkey(HK_TOGGLE_TEXTURES))
g_Config.bHiresTextures = !g_Config.bHiresTextures;
Core::SetIsThrottlerTempDisabled(IsHotkey(HK_TOGGLE_THROTTLE, true)); Core::SetIsThrottlerTempDisabled(IsHotkey(HK_TOGGLE_THROTTLE, true));
if (IsHotkey(HK_DECREASE_EMULATION_SPEED)) if (IsHotkey(HK_DECREASE_EMULATION_SPEED))
{ {