diff options
| author | Matthew Parlane <parlane@gmail.com> | 2013-01-01 23:28:46 +1300 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2013-01-01 23:28:46 +1300 |
| commit | e0c9a1fd09b9be953bf0ae41b9014485e750b07e (patch) | |
| tree | 059744e17a2a35ca58dd9b817cab620faee38611 /Source/Core/VideoCommon/Src/EmuWindow.cpp | |
| parent | fe1fdc5e7b957312c906324134e42ca3484fa2d5 (diff) | |
| parent | c728ef2cd30ef803210d5db0a1ecab6b198a2c65 (diff) | |
Merge branch 'master' into wii-network
Conflicts:
Source/Core/Common/Src/CommonPaths.h
Source/Core/Core/CMakeLists.txt
Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp
Diffstat (limited to 'Source/Core/VideoCommon/Src/EmuWindow.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/Src/EmuWindow.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/Source/Core/VideoCommon/Src/EmuWindow.cpp b/Source/Core/VideoCommon/Src/EmuWindow.cpp index 30dca24cb1..cbb0bc31ac 100644 --- a/Source/Core/VideoCommon/Src/EmuWindow.cpp +++ b/Source/Core/VideoCommon/Src/EmuWindow.cpp @@ -251,7 +251,7 @@ void OSDMenu(WPARAM wParam) OSDChoice = 1; // Toggle native resolution g_Config.iEFBScale = g_Config.iEFBScale + 1; - if (g_Config.iEFBScale > 4) g_Config.iEFBScale = 0; + if (g_Config.iEFBScale > 7) g_Config.iEFBScale = 0; break; case '4': OSDChoice = 2; @@ -280,11 +280,6 @@ void OSDMenu(WPARAM wParam) OSDChoice = 4; g_Config.bDisableFog = !g_Config.bDisableFog; break; - case '7': - // TODO: Not implemented in the D3D backends, yet - OSDChoice = 5; - g_Config.bDisableLighting = !g_Config.bDisableLighting; - break; } } |