Changeset 9259 for code/trunk/src/modules/overlays/hud/HUDEnemyHealthBar.h

Timestamp:

May 28, 2012, 4:47:47 PM (12 years ago)

Author:

landauf

Message:

refactored HUDEnemyHealthBar: now it uses ControllableEntity::getTarget() instead of searching the target itself

File:

• code/trunk/src/modules/overlays/hud/HUDEnemyHealthBar.h (modified) (2 diffs)

code/trunk/src/modules/overlays/hud/HUDEnemyHealthBar.h

@@ -23 +23 @@
  *      Matthias Spalinger
  *   Co-authors:
- *      ...
+ *      Fabian 'x3n' Landau
  *
  */
@@ -30 +30 @@
 #define _HUDEnemyHealthBar_H__
 
-#include "interfaces/RadarViewable.h"
-#include "worldentities/pawns/Pawn.h"
-
 #include "HUDHealthBar.h"
-#include "interfaces/RadarListener.h"
 
 namespace orxonox
 {
-    class _OverlaysExport HUDEnemyHealthBar : public HUDHealthBar, public RadarListener
+    class _OverlaysExport HUDEnemyHealthBar : public HUDHealthBar
     {
         public:
             HUDEnemyHealthBar(BaseObject* creator);
             virtual ~HUDEnemyHealthBar();
+
             void setConfigValues();
-
-            bool compareDistance ( std::pair<RadarViewable*, unsigned int > a, std::pair<RadarViewable*, unsigned int > b );
-
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             virtual void tick(float dt);
-
-            //RadarListener interface
-            void addObject ( RadarViewable* object );
-            void removeObject ( RadarViewable* viewable );
-            void objectChanged(RadarViewable* viewable);
-            virtual void radarTick ( float dt ) {}
-            inline float getRadarSensitivity() const
-                { return 1.0f; }
 
             void changedOwner();
 
         private:
+            void updateTarget();
 
-            void setSensibility (float sense){
-                this->sens_ = sense;}
-            float getSensibility(){
-                return this->sens_;}
-
-            bool showObject(RadarViewable* rv);
-        
-            typedef std::list < std::pair<RadarViewable*, unsigned int > > sortedList;
-            sortedList sortedObjectList_;
-
-            Pawn* owner_;
-            float sens_;
+            ControllableEntity* owner_;
             bool useEnemyBar_;
-            unsigned int markerLimit_;
-
-            float currentYaw;
-            float currentPitch;
     };
 }