Merge pull request #2940 from thedax/master

Win32 UI: Fix frameskipping menu & minor cleanup.
This commit is contained in:
Henrik Rydgård 2013-07-27 02:33:13 -07:00
commit e212f2d91d

View File

@ -1209,7 +1209,7 @@ namespace MainWindow
ID_OPTIONS_SCREEN3X, ID_OPTIONS_SCREEN3X,
ID_OPTIONS_SCREEN4X, 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)); CheckMenuItem(menu, zoomitems[i], MF_BYCOMMAND | ((i == g_Config.iWindowZoom - 1) ? MF_CHECKED : MF_UNCHECKED));
} }
@ -1220,8 +1220,8 @@ namespace MainWindow
ID_TEXTURESCALING_4X, ID_TEXTURESCALING_4X,
ID_TEXTURESCALING_5X, 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)); CheckMenuItem(menu, texscalingitems[i], MF_BYCOMMAND | ((i == g_Config.iTexScalingLevel - 1) ? MF_CHECKED : MF_UNCHECKED));
} }
static const int texscalingtypeitems[] = { static const int texscalingtypeitems[] = {
@ -1230,7 +1230,7 @@ namespace MainWindow
ID_TEXTURESCALING_BICUBIC, ID_TEXTURESCALING_BICUBIC,
ID_TEXTURESCALING_HYBRID_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)); 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,
ID_OPTIONS_LINEARFILTERING_CG, 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); 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_READFBOTOMEMORYCPU,
ID_OPTIONS_READFBOTOMEMORYGPU, 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); 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_8,
ID_OPTIONS_FRAMESKIP_9, ID_OPTIONS_FRAMESKIP_9,
}; };
for (int i = 0; i < 9; i++) { for (int i = 0; i < ARRAY_SIZE(frameskipping); i++) {
CheckMenuItem(menu, frameskipping[i], MF_BYCOMMAND | ( i == g_Config.iFrameSkip )? MF_CHECKED : MF_UNCHECKED); CheckMenuItem(menu, frameskipping[i], MF_BYCOMMAND | ( i == g_Config.iFrameSkip )? MF_CHECKED : MF_UNCHECKED);
} }