Changeset 3049 for code/trunk/src/orxonox/objects/worldentities/ControllableEntity.h

Timestamp:

May 25, 2009, 3:26:43 AM (15 years ago)

Author:

landauf

Message:

• Added option to add a Controller to a ControllableEntity in the XML file
• Added two new classes: WaypointController (follows waypoints) and WaypointPatrolController (follows waypoints and kills enemies within a given radius)
• Radarpoints in TeamDeathmatch are now coloured

File:

• code/trunk/src/orxonox/objects/worldentities/ControllableEntity.h (modified) (3 diffs)

code/trunk/src/orxonox/objects/worldentities/ControllableEntity.h

@@ -130 +130 @@
                 { return this->mouseLookSpeed_; }
 
+            inline Controller* getXMLController() const
+                { return this->xmlcontroller_; }
+
         protected:
             virtual void setPlayer(PlayerInfo* player); // don't call this directly, use friend class PlayerInfo instead
@@ -142 +145 @@
 
         private:
+            void setXMLController(Controller* controller);
+
             void overwrite();
             void processOverwrite();
@@ -188 +193 @@
             std::list<CameraPosition*> cameraPositions_;
             std::string cameraPositionTemplate_;
+            Controller* xmlcontroller_;
     };
 }