Changeset 6045 for code/branches/steering/src/orxonox/worldentities

Timestamp:

Nov 11, 2009, 5:39:53 PM (15 years ago)

Author:

wirthmi

Message:

First implementation of direction shooting.

Location:

code/branches/steering/src/orxonox/worldentities

Files:

• ControllableEntity.cc (modified) (1 diff)
• ControllableEntity.h (modified) (2 diffs)

code/branches/steering/src/orxonox/worldentities/ControllableEntity.cc

@@ -62 +62 @@
         this->camera_ = 0;
         this->xmlcontroller_ = 0;
+        this->controller_ = 0;
         this->reverseCamera_ = 0;
         this->bDestroyWhenPlayerLeft_ = false;

code/branches/steering/src/orxonox/worldentities/ControllableEntity.h

@@ -139 +139 @@
             inline Controller* getXMLController() const
                 { return this->xmlcontroller_; }
+
+            inline Controller* getController() const
+                { return this->controller_; }
+            inline void setController(Controller* c)
+                { this->controller_ = c; }
 
         protected:
@@ -201 +206 @@
             std::string cameraPositionTemplate_;
             Controller* xmlcontroller_;
+            Controller* controller_;
             CameraPosition* reverseCamera_;
     };