Changeset 8852 for code/branches/ai2/src/orxonox/worldentities/ControllableEntity.h

Timestamp:

Aug 21, 2011, 11:10:54 PM (14 years ago)

Author:

jo

Message:

Buxfix.

File:

• code/branches/ai2/src/orxonox/worldentities/ControllableEntity.h (modified) (3 diffs)

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

@@ -99 +99 @@
             */
             virtual void boost(bool bBoost) {}
-            
+
             virtual void greet() {}
             virtual void switchCamera();
@@ -155 +155 @@
 
             inline Controller* getController() const
-                { return this->controller_; }
-            inline void setController(Controller* val)
-                { this->controller_ = val; }
+                { return this->controller_.get(); }
+            void setController(Controller* val);
+
 
             virtual void setTarget( WorldEntity* target );
@@ -237 +237 @@
             std::string cameraPositionTemplate_;
             Controller* xmlcontroller_;
-            Controller* controller_;
+            WeakPtr<Controller> controller_;
             CameraPosition* reverseCamera_;
             WeakPtr<WorldEntity> target_;
+            WeakPtr<Controller> test_;
     };
 }