Changeset 6082 for code/branches/particles2/src/orxonox

Timestamp:

Nov 17, 2009, 10:57:44 PM (15 years ago)

Author:

scheusso

Message:

some fixes in Rocket
there are two new function ins PlayerInfo: startTemporaryControl and stopTemporaryControl which expand start/stop-Control but without removing the player from the currently controlled controllable entity

Location:

code/branches/particles2/src/orxonox/infos

Files:

• PlayerInfo.cc (modified) (2 diffs)
• PlayerInfo.h (modified) (2 diffs)

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

@@ -163 +163 @@
         this->changedControllableEntity();
     }
+    
+    void PlayerInfo::startTemporaryControl(ControllableEntity* entity)
+    {
+        if (!entity || entity == this->controllableEntity_)
+            return;
+
+//         if (this->controllableEntity_)
+//             this->stopControl();
+
+        this->oldControllableEntity_ = this->controllableEntity_;
+
+        this->controllableEntity_ = entity;
+        this->controllableEntityID_ = entity->getObjectID();
+
+        entity->setPlayer(this);
+
+        this->bReadyToSpawn_ &= (!this->bSetUnreadyAfterSpawn_);
+
+        if (this->controller_)
+            this->controller_->setControllableEntity(entity);
+
+        this->changedControllableEntity();
+    }
 
     void PlayerInfo::stopControl()
@@ -178 +201 @@
 
         entity->removePlayer();
-
+        
+        if ( this->oldControllableEntity_ )
+        {
+            this->oldControllableEntity_->removePlayer();
+            this->oldControllableEntity_ = 0;
+        }
+
+        this->changedControllableEntity();
+    }
+    
+    void PlayerInfo::stopTemporaryControl()
+    {
+        ControllableEntity* entity = this->controllableEntity_;
+
+        if (!entity)
+            return;
+
+        this->controllableEntity_ = this->oldControllableEntity_.get();
+        this->controllableEntityID_ = this->controllableEntity_->getObjectID();
+
+        if (this->controller_)
+            this->controller_->setControllableEntity(this->controllableEntity_);
+
+        entity->removePlayer();
+        
         this->changedControllableEntity();
     }

code/branches/particles2/src/orxonox/infos/PlayerInfo.h

@@ -69 +69 @@
             void startControl(ControllableEntity* entity);
             void stopControl();
+            void startTemporaryControl(ControllableEntity* entity);
+            void stopTemporaryControl();
 
             inline ControllableEntity* getControllableEntity() const
@@ -96 +98 @@
             Controller* controller_;
             ControllableEntity* controllableEntity_;
+            WeakPtr<ControllableEntity> oldControllableEntity_;
             unsigned int controllableEntityID_;