[Orxonox-commit 4181] r8852 - in code/branches/ai2/src/orxonox/worldentities: . pawns

[jo at orxonox.net]

Author: jo
Date: 2011-08-21 23:10:54 +0200 (Sun, 21 Aug 2011)
New Revision: 8852

Modified:
   code/branches/ai2/src/orxonox/worldentities/ControllableEntity.cc
   code/branches/ai2/src/orxonox/worldentities/ControllableEntity.h
   code/branches/ai2/src/orxonox/worldentities/pawns/Pawn.h
Log:
Buxfix.

Modified: code/branches/ai2/src/orxonox/worldentities/ControllableEntity.cc
===================================================================
--- code/branches/ai2/src/orxonox/worldentities/ControllableEntity.cc	2011-08-21 16:52:33 UTC (rev 8851)
+++ code/branches/ai2/src/orxonox/worldentities/ControllableEntity.cc	2011-08-21 21:10:54 UTC (rev 8852)
@@ -66,7 +66,7 @@
         this->hud_ = 0;
         this->camera_ = 0;
         this->xmlcontroller_ = 0;
-        this->controller_ = 0;
+        //this->controller_ = 0;
         this->reverseCamera_ = 0;
         this->bDestroyWhenPlayerLeft_ = false;
         this->cameraPositionRootNode_ = this->node_->createChildSceneNode();
@@ -189,7 +189,7 @@
 
         return counter;
     }
-    
+
     bool ControllableEntity::setCameraPosition(unsigned int index)
     {
         if(this->camera_ != NULL && this->cameraPositions_.size() > 0)
@@ -309,6 +309,11 @@
         }
     }
 
+    void ControllableEntity::setController(Controller* val)
+    {
+        this->controller_ = val;
+    }
+
     void ControllableEntity::setTarget( WorldEntity* target )
     {
         this->target_ = target;

Modified: code/branches/ai2/src/orxonox/worldentities/ControllableEntity.h
===================================================================
--- code/branches/ai2/src/orxonox/worldentities/ControllableEntity.h	2011-08-21 16:52:33 UTC (rev 8851)
+++ code/branches/ai2/src/orxonox/worldentities/ControllableEntity.h	2011-08-21 21:10:54 UTC (rev 8852)
@@ -98,7 +98,7 @@
             @param bBoost If true the ControllableEntity is told to start boosting, if false it is told to stop.
             */
             virtual void boost(bool bBoost) {}
-            
+
             virtual void greet() {}
             virtual void switchCamera();
             virtual void mouseLook();
@@ -154,10 +154,10 @@
                 { return this->xmlcontroller_; }
 
             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 );
             virtual WorldEntity* getTarget()
                 { return this->target_.get(); }
@@ -236,9 +236,10 @@
             CameraPosition* currentCameraPosition_;
             std::string cameraPositionTemplate_;
             Controller* xmlcontroller_;
-            Controller* controller_;
+            WeakPtr<Controller> controller_;
             CameraPosition* reverseCamera_;
             WeakPtr<WorldEntity> target_;
+            WeakPtr<Controller> test_;
     };
 }
 

Modified: code/branches/ai2/src/orxonox/worldentities/pawns/Pawn.h
===================================================================
--- code/branches/ai2/src/orxonox/worldentities/pawns/Pawn.h	2011-08-21 16:52:33 UTC (rev 8851)
+++ code/branches/ai2/src/orxonox/worldentities/pawns/Pawn.h	2011-08-21 21:10:54 UTC (rev 8852)
@@ -194,7 +194,7 @@
             float health_;
             float maxHealth_;
             float initialHealth_;
-            
+
             float shieldHealth_;
             float maxShieldHealth_;
             float initialShieldHealth_;