Changeset 6045 for code/branches/steering/src/orxonox/infos/PlayerInfo.cc

Timestamp:

Nov 11, 2009, 5:39:53 PM (14 years ago)

Author:

wirthmi

Message:

First implementation of direction shooting.

File:

• code/branches/steering/src/orxonox/infos/PlayerInfo.cc (modified) (3 diffs)

code/branches/steering/src/orxonox/infos/PlayerInfo.cc

@@ -138 +138 @@
         assert(this->controller_);
         this->controller_->setPlayer(this);
-        if (this->controllableEntity_)
+        if (this->controllableEntity_) {
             this->controller_->setControllableEntity(this->controllableEntity_);
+            this->controllableEntity_->setController(this->controller_);
+        }
         this->changedController();
     }
@@ -158 +160 @@
         this->bReadyToSpawn_ &= (!this->bSetUnreadyAfterSpawn_);
 
-        if (this->controller_)
+        if (this->controller_) {
             this->controller_->setControllableEntity(entity);
+            this->controllableEntity_->setController(this->controller_);
+        }
 
         this->changedControllableEntity();
@@ -171 +175 @@
             return;
 
+        this->controllableEntity_->setController(0);
         this->controllableEntity_ = 0;
         this->controllableEntityID_ = OBJECTID_UNKNOWN;