Changeset 6108 for code/branches/presentation2/src/orxonox/worldentities/ControllableEntity.h

Timestamp:

Nov 20, 2009, 8:15:25 PM (16 years ago)

Author:

scheusso

Message:

merged steering branch to presentation2 branch

Location:

code/branches/presentation2

Files:

• . (modified) (1 prop)
• src/orxonox/worldentities/ControllableEntity.h (modified) (2 diffs)

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

@@ -140 +140 @@
             inline Controller* getXMLController() const
                 { return this->xmlcontroller_; }
+
+            inline Controller* getController() const
+                { return this->controller_; }
+            inline void setController(Controller* val)
+                { this->controller_ = val; }
 
         protected:
@@ -202 +207 @@
             std::string cameraPositionTemplate_;
             Controller* xmlcontroller_;
+            Controller* controller_;
             CameraPosition* reverseCamera_;
     };