From 883db82255ebb11b89f04c35181f69e441317869 Mon Sep 17 00:00:00 2001 From: The Dax Date: Fri, 26 Jul 2013 19:29:47 -0400 Subject: [PATCH 1/2] Win32 UI: Fix frameskipping menu. Picking 9 would never be checked or work. --- Windows/WndMainWindow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp index 040f6b7425..0e1afe63bc 100644 --- a/Windows/WndMainWindow.cpp +++ b/Windows/WndMainWindow.cpp @@ -1221,7 +1221,7 @@ namespace MainWindow ID_TEXTURESCALING_5X, }; for (int i = 0; i < 5; i++) { - CheckMenuItem(menu, texscalingitems[i], MF_BYCOMMAND | ((i == g_Config.iTexScalingLevel-1) ? MF_CHECKED : MF_UNCHECKED)); + CheckMenuItem(menu, texscalingitems[i], MF_BYCOMMAND | ((i == g_Config.iTexScalingLevel - 1) ? MF_CHECKED : MF_UNCHECKED)); } static const int texscalingtypeitems[] = { @@ -1266,7 +1266,7 @@ namespace MainWindow ID_OPTIONS_FRAMESKIP_8, ID_OPTIONS_FRAMESKIP_9, }; - for (int i = 0; i < 9; i++) { + for (int i = 0; i < 10; i++) { CheckMenuItem(menu, frameskipping[i], MF_BYCOMMAND | ( i == g_Config.iFrameSkip )? MF_CHECKED : MF_UNCHECKED); } From c7a82b59e9fa593e51959d6e06f2e7bc221ae76e Mon Sep 17 00:00:00 2001 From: The Dax Date: Fri, 26 Jul 2013 19:36:16 -0400 Subject: [PATCH 2/2] Convert all of the checkbox loops to use ARRAY_SIZE instead of magic numbers. --- Windows/WndMainWindow.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp index 0e1afe63bc..6ee22231fd 100644 --- a/Windows/WndMainWindow.cpp +++ b/Windows/WndMainWindow.cpp @@ -1209,7 +1209,7 @@ namespace MainWindow ID_OPTIONS_SCREEN3X, ID_OPTIONS_SCREEN4X, }; - for (int i = 0; i < 4; i++) { + for (int i = 0; i < ARRAY_SIZE(zoomitems); i++) { CheckMenuItem(menu, zoomitems[i], MF_BYCOMMAND | ((i == g_Config.iWindowZoom - 1) ? MF_CHECKED : MF_UNCHECKED)); } @@ -1220,7 +1220,7 @@ namespace MainWindow ID_TEXTURESCALING_4X, ID_TEXTURESCALING_5X, }; - for (int i = 0; i < 5; i++) { + for (int i = 0; i < ARRAY_SIZE(texscalingitems); i++) { CheckMenuItem(menu, texscalingitems[i], MF_BYCOMMAND | ((i == g_Config.iTexScalingLevel - 1) ? MF_CHECKED : MF_UNCHECKED)); } @@ -1230,7 +1230,7 @@ namespace MainWindow ID_TEXTURESCALING_BICUBIC, ID_TEXTURESCALING_HYBRID_BICUBIC, }; - for (int i = 0; i < 4; i++) { + for (int i = 0; i < ARRAY_SIZE(texscalingtypeitems); i++) { CheckMenuItem(menu, texscalingtypeitems[i], MF_BYCOMMAND | ((i == g_Config.iTexScalingType) ? MF_CHECKED : MF_UNCHECKED)); } @@ -1240,7 +1240,7 @@ namespace MainWindow ID_OPTIONS_LINEARFILTERING, ID_OPTIONS_LINEARFILTERING_CG, }; - for (int i = 0; i < 4; i++) { + for (int i = 0; i < ARRAY_SIZE(texfilteringitems); i++) { CheckMenuItem(menu, texfilteringitems[i], MF_BYCOMMAND | ( (i + 1) == g_Config.iTexFiltering )? MF_CHECKED : MF_UNCHECKED); } @@ -1250,7 +1250,7 @@ namespace MainWindow ID_OPTIONS_READFBOTOMEMORYCPU, ID_OPTIONS_READFBOTOMEMORYGPU, }; - for (int i = 0; i < 4; i++) { + for (int i = 0; i < ARRAY_SIZE(renderingmode); i++) { CheckMenuItem(menu, renderingmode[i], MF_BYCOMMAND | ( i == g_Config.iRenderingMode )? MF_CHECKED : MF_UNCHECKED); } @@ -1266,7 +1266,7 @@ namespace MainWindow ID_OPTIONS_FRAMESKIP_8, ID_OPTIONS_FRAMESKIP_9, }; - for (int i = 0; i < 10; i++) { + for (int i = 0; i < ARRAY_SIZE(frameskipping); i++) { CheckMenuItem(menu, frameskipping[i], MF_BYCOMMAND | ( i == g_Config.iFrameSkip )? MF_CHECKED : MF_UNCHECKED); }