Changeset 9731 for code/branches/levelMichael/src/orxonox/controllers/WaypointPatrolController.h

Timestamp:

Nov 1, 2013, 12:17:13 AM (12 years ago)

Author:

jo

Message:

Merged trunk into branch levelMichael to add new features.

Location:

code/branches/levelMichael

Files:

• . (modified) (1 prop)
• src/orxonox/controllers/WaypointPatrolController.h (modified) (1 diff)

code/branches/levelMichael/src/orxonox/controllers/WaypointPatrolController.h

@@ -50 +50 @@
             inline float getAlertnessRadius() const
                 { return this->alertnessradius_; }
+                
+            inline void setAttackRadius(float distance)
+                { this->attackradius_ = distance; }
+            inline float getAttackRadius() const
+                { return this->attackradius_; }
 
         protected:
             void searchEnemy();
 
-            float alertnessradius_;
+            float alertnessradius_; //!< Enemies within this radius are being followed and shot.
+            float attackradius_;    //!< Enemies only get shot, if they are within the attackradius_.
             Timer patrolTimer_;
     };