Changeset 9254

Timestamp:

May 28, 2012, 12:19:54 AM (13 years ago)

Author:

landauf

Message:

update radar-visibility if the visibility of the pawn itself changes. but don't tie it to the visibility directly (and neither to the activity).

Location:

code/trunk/src/orxonox/worldentities/pawns

Files:

• Pawn.cc (modified) (2 diffs)
• Pawn.h (modified) (1 diff)

code/trunk/src/orxonox/worldentities/pawns/Pawn.cc

@@ -129 +129 @@
         XMLPortParam(Pawn, "reloadrate", setReloadRate, getReloadRate, xmlelement, mode).defaultValues(0);
         XMLPortParam(Pawn, "reloadwaittime", setReloadWaitTime, getReloadWaitTime, xmlelement, mode).defaultValues(1.0f);
-   
+
         XMLPortParam ( RadarViewable, "RVName", setRVName, getRVName, xmlelement, mode );
     }
@@ -453 +453 @@
     }
 
-    void Pawn::changedActivity(void)
-    {
-        SUPER(Pawn, changedActivity);
-
-        this->setRadarVisibility(this->isVisible());
-    }
-
     void Pawn::changedVisibility(void)
     {
         SUPER(Pawn, changedVisibility);
-        //this->setVisible(this->isVisible());
-        this->setRadarVisibility(this->isVisible());
+
+        // enable proper radarviewability when the visibility is changed
+        this->RadarViewable::settingsChanged();
     }
 

code/trunk/src/orxonox/worldentities/pawns/Pawn.h

@@ -171 +171 @@
             virtual const Vector3& getCarrierPosition(void) const
                 { return this->getWorldPosition(); };
-            virtual void changedActivity(void); //!< To enable radarviewability when the activity is changed
-            virtual void changedVisibility(void); //!< To enable proper radarviewability when the visibility is changed
+
+            virtual void changedVisibility();
 
         protected: