Changeset 7154 for code/branches/presentation3/src/orxonox

Timestamp:

Jul 12, 2010, 2:06:15 PM (14 years ago)

Author:

scheusso

Message:

some rocket related fixes

File:

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

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

@@ -177 +177 @@
             return;
 
-//         assert( this->temporaryControllableEntity_==0 );
+        assert( this->oldControllableEntity_==0 );
 
         this->oldControllableEntity_ = this->controllableEntity_;
@@ -184 +184 @@
 
         entity->setPlayer(this);
+        entity->setController(this->controller_);
 
         if (this->controller_)
@@ -222 +223 @@
             return;
 
+        this->controllableEntity_->setController(0);
+        
         this->controllableEntity_ = this->oldControllableEntity_;
         this->controllableEntityID_ = this->controllableEntity_->getObjectID();