Changeset 8891 for code/trunk/src/orxonox/controllers/WaypointController.cc

Timestamp:

Oct 12, 2011, 7:50:43 PM (14 years ago)

Author:

jo

Message:

Ai and tutorial improvements merged back to the trunk. AI features: all weapons are used, the ai-firestrength is configurable, bots are able to collect pickups . I've set the tutorial level as default level.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/controllers/WaypointController.cc (modified) (4 diffs)

code/trunk/src/orxonox/controllers/WaypointController.cc

@@ -40 +40 @@
     {
         RegisterObject(WaypointController);
-
-        this->currentWaypoint_ = 0;
         this->setAccuracy(100);
     }
@@ -47 +45 @@
     WaypointController::~WaypointController()
     {
-        if (this->isInitialized())
+        for (size_t i = 0; i < this->waypoints_.size(); ++i)
         {
-            for (size_t i = 0; i < this->waypoints_.size(); ++i)
+            if(this->waypoints_[i])
                 this->waypoints_[i]->destroy();
         }
@@ -58 +56 @@
         SUPER(WaypointController, XMLPort, xmlelement, mode);
 
-        XMLPortParam(WaypointController, "accuracy", setAccuracy, getAccuracy, xmlelement, mode).defaultValues(100.0f);
-        XMLPortObject(WaypointController, WorldEntity, "waypoints", addWaypoint, getWaypoint,  xmlelement, mode);
+        XMLPortParam(ArtificialController, "accuracy", setAccuracy, getAccuracy, xmlelement, mode).defaultValues(100.0f);
+        XMLPortObject(ArtificialController, WorldEntity, "waypoints", addWaypoint, getWaypoint,  xmlelement, mode);
     }
 
@@ -76 +74 @@
     }
 
-    void WaypointController::addWaypoint(WorldEntity* waypoint)
-    {
-        this->waypoints_.push_back(waypoint);
-    }
-
-    WorldEntity* WaypointController::getWaypoint(unsigned int index) const
-    {
-        if (index < this->waypoints_.size())
-            return this->waypoints_[index];
-        else
-            return 0;
-    }
 }