ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove even more unneeded complex if statements

This commit is contained in:
Arthur Moore 2015-01-17 03:39:51 -05:00
parent a917078066
commit 97d300bbc0
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/wx/cmdevents.cpp
View File

@ -2002,12 +2002,13 @@ EVT_HANDLER_MASK(ChangeFilter, "Change Pixel Filter", CMDEN_NREC_ANY)
int filt = gopts.filter;
if(filt == FF_PLUGIN ||
++gopts.filter == FF_PLUGIN && gopts.filter_plugin.empty())
gopts.filter = 0;
{
gopts.filter = 0;
}
update_opts();
if(panel->panel &&
builtin_ff_scale(filt) != builtin_ff_scale(gopts.filter)) {
panel->panel->Delete();
panel->panel = NULL;
if(panel->panel) {
panel->panel->Delete();
panel->panel = NULL;
}
}
@ -2015,14 +2016,10 @@ EVT_HANDLER_MASK(ChangeIFB, "Change Interframe Blending", CMDEN_NREC_ANY)
{
gopts.ifb = (gopts.ifb + 1) % 3;
update_opts();
if(panel->panel &&
// ifb doesn't support 24-bit
(gopts.ifb != IFB_NONE && systemColorDepth == 24) ||
// standard prefers 24-bit
(gopts.ifb == IFB_NONE && gopts.filter == FF_NONE &&
systemColorDepth == 32 && gopts.render_method == 0)) {
panel->panel->Delete();
panel->panel = NULL;
if(panel->panel)
{
panel->panel->Delete();
panel->panel = NULL;
}
}