From: david Date: Wed, 6 Mar 2002 13:51:05 +0000 (+0000) Subject: Patch from Andy Ross to hide virtual panel when required: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0bdc1b169922886ea8d024cc6c6f34a7cbd8f571;p=flightgear.git Patch from Andy Ross to hide virtual panel when required: Oh yeah, I forgot to send that one along. This one is my bug, I goofed the precedence in the fgPanelVisible() function in panel.cxx such that the panel was *always* visible if virtual cockpit was enabled. Here's a replacement. I've modified the style from a single boolean expression to an if-list, since that's more readable to my eyes for expressions this big: --- diff --git a/src/Cockpit/panel.cxx b/src/Cockpit/panel.cxx index 913fc4bfd..e912dc390 100644 --- a/src/Cockpit/panel.cxx +++ b/src/Cockpit/panel.cxx @@ -83,16 +83,16 @@ get_aspect_adjust (int xsize, int ysize) bool fgPanelVisible () { - if(current_panel == 0) + if(current_panel == 0) return false; - if(current_panel->getVisibility() == 0) + if(current_panel->getVisibility() == 0) return false; - if(globals->get_viewmgr()->get_current() != 0) + if(globals->get_viewmgr()->get_current() != 0) return false; - if(globals->get_current_view()->get_view_offset() != 0 && - !fgGetBool("/sim/virtual-cockpit")) + if(globals->get_current_view()->get_view_offset() != 0 && + !fgGetBool("/sim/virtual-cockpit")) return false; - return true; + return true; }