Changeset 8852 for code/branches

Timestamp:

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

Author:

jo

Message:

Buxfix.

Location:

code/branches/ai2/src/orxonox/worldentities

Files:

• ControllableEntity.cc (modified) (3 diffs)
• ControllableEntity.h (modified) (3 diffs)
• pawns/Pawn.h (modified) (1 diff)

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

@@ -67 +67 @@
         this->camera_ = 0;
         this->xmlcontroller_ = 0;
-        this->controller_ = 0;
+        //this->controller_ = 0;
         this->reverseCamera_ = 0;
         this->bDestroyWhenPlayerLeft_ = false;
@@ -190 +190 @@
         return counter;
     }
-    
+
     bool ControllableEntity::setCameraPosition(unsigned int index)
     {
@@ -310 +310 @@
     }
 
+    void ControllableEntity::setController(Controller* val)
+    {
+        this->controller_ = val;
+    }
+
     void ControllableEntity::setTarget( WorldEntity* target )
     {

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_;
     };
 }

code/branches/ai2/src/orxonox/worldentities/pawns/Pawn.h

@@ -195 +195 @@
             float maxHealth_;
             float initialHealth_;
-            
+
             float shieldHealth_;
             float maxShieldHealth_;