From 2430324c40eed360f6b7436cff9fa4106defd179 Mon Sep 17 00:00:00 2001 From: The Dax Date: Mon, 1 Jul 2013 15:42:45 -0400 Subject: [PATCH] Rename "Off" to "Auto", and fix buggy menu. --- Windows/WndMainWindow.cpp | 13 ++++++++----- Windows/ppsspp.rc | Bin 43508 -> 43512 bytes 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp index ec0499d5d9..7673b323d8 100644 --- a/Windows/WndMainWindow.cpp +++ b/Windows/WndMainWindow.cpp @@ -744,8 +744,8 @@ namespace MainWindow case ID_OPTIONS_USEVBO: g_Config.bUseVBO = !g_Config.bUseVBO; break; - case ID_OPTIONS_TEXTUREFILTERING_OFF: - setTexFiltering(1); + case ID_OPTIONS_TEXTUREFILTERING_AUTO: + setTexFiltering(0); break; case ID_OPTIONS_NEARESTFILTERING: setTexFiltering(2) ; @@ -956,13 +956,16 @@ namespace MainWindow } static const int texfilteringitems[] = { - ID_OPTIONS_TEXTUREFILTERING_OFF, + ID_OPTIONS_TEXTUREFILTERING_AUTO, ID_OPTIONS_NEARESTFILTERING, ID_OPTIONS_LINEARFILTERING, ID_OPTIONS_LINEARFILTERING_CG, }; - for (int i = 0; i < 3; i++) { - CheckMenuItem(menu, texfilteringitems[i], MF_BYCOMMAND | ((i == g_Config.iTexFiltering-2) ? MF_CHECKED : MF_UNCHECKED)); + for (int i = 0; i < 4; i++) { + if(i != 0) + CheckMenuItem(menu, texfilteringitems[i], MF_BYCOMMAND | ((i == g_Config.iTexFiltering-1) ? MF_CHECKED : MF_UNCHECKED)); + else + CheckMenuItem(menu, texfilteringitems[i], MF_BYCOMMAND | ((i == g_Config.iTexFiltering) ? MF_CHECKED : MF_UNCHECKED)); } UpdateCommands(); diff --git a/Windows/ppsspp.rc b/Windows/ppsspp.rc index a4dca8df392a57168715637166745df60b7ec625..b123d2e19cf14ced1c719eebf51031a5f884a7ac 100644 GIT binary patch delta 42 ycmexznd!%6rVT}%?2Zhj3?&TtlN0leCx4hEFnL#}61yWqC_@N?|K^9C!U_O<>kuUX delta 36 scmexynd!@ArVT}%lOJ>&O%7-go4lt}iPfLMjlpelV5j0{wysa|07Y02s{jB1