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

Timestamp:

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

Author:

jo

Message:

Buxfix.

File:

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

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 )
     {