Changeset 5980 for code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc

Timestamp:

Oct 21, 2009, 4:06:50 PM (15 years ago)

Author:

scheusso

Message:

fixed a logical error in OverlayGroup/OrxonoxOverlay (visibility of overlays in a overlaygroup could not be configured individually)
changed Scoreboard/CreateLines accordingly
set initial visibility of QuestGUI to false

File:

• code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified) (2 diffs)

code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc

@@ -48 +48 @@
 #include "core/ConsoleCommand.h"
 
+#include "OverlayGroup.h"
+
 namespace orxonox
 {
@@ -165 +167 @@
     void OrxonoxOverlay::changedVisibility()
     {
+        SUPER( OrxonoxOverlay, changedVisibility );
+        
         if (!this->overlay_)
             return;
 
-        if (this->isVisible())
+        // only set to visible if corresponding OverlayGroup is also visible
+        if (this->isVisible() && (!this->getOverlayGroup() || this->getOverlayGroup()->isVisible()) )
             this->overlay_->show();
         else