Changeset 7034 for code/branches/presentation3/src/orxonox/controllers/WaypointPatrolController.h

Timestamp:

May 31, 2010, 5:31:50 AM (15 years ago)

Author:

landauf

Message:

merged ai branch to presentation3

Location:

code/branches/presentation3

Files:

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

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

@@ -46 +46 @@
             virtual void tick(float dt);
 
-            inline void setTeam(int team)
+           /* inline void setTeam(int team)
                 { this->team_ = team; }
             inline int getTeam() const
-                { return this->team_; }
+                { return this->team_; } */
 
             inline void setAlertnessRadius(float radius)
@@ -59 +59 @@
             void searchEnemy();
 
-            int team_;
+            //int team_;
             float alertnessradius_;
             Timer patrolTimer_;