Changeset 3038 for code/trunk/src/orxonox/objects/infos

Timestamp:

May 24, 2009, 5:42:50 PM (16 years ago)

Author:

landauf

Message:

Cleaned up setPlayer/removePlayer interface between PlayerInfo and ControllableEntity. The whole control is now up to the PlayerInfo, the respective functions in ControllableEntity are now protected.

Location:

code/trunk/src/orxonox/objects/infos

Files:

• PlayerInfo.cc (modified) (4 diffs)
• PlayerInfo.h (modified) (1 diff)

code/trunk/src/orxonox/objects/infos/PlayerInfo.cc

@@ -62 +62 @@
         if (this->BaseObject::isInitialized())
         {
-            this->stopControl(this->controllableEntity_);
+            this->stopControl();
 
             if (this->controller_)
@@ -142 +142 @@
     }
 
-    void PlayerInfo::startControl(ControllableEntity* entity, bool callback)
-    {
-        if (entity == this->controllableEntity_)
+    void PlayerInfo::startControl(ControllableEntity* entity)
+    {
+        if (!entity || entity == this->controllableEntity_)
             return;
 
         if (this->controllableEntity_)
-            this->stopControl(this->controllableEntity_, callback);
+            this->stopControl();
 
         this->controllableEntity_ = entity;
-
-        if (entity)
-        {
-            this->controllableEntityID_ = entity->getObjectID();
-            entity->setPlayer(this);
-            this->bReadyToSpawn_ &= (!this->bSetUnreadyAfterSpawn_);
-        }
-        else
-        {
-            this->controllableEntityID_ = OBJECTID_UNKNOWN;
-        }
+        this->controllableEntityID_ = entity->getObjectID();
+
+        entity->setPlayer(this);
+
+        this->bReadyToSpawn_ &= (!this->bSetUnreadyAfterSpawn_);
 
         if (this->controller_)
@@ -169 +163 @@
     }
 
-    void PlayerInfo::stopControl(ControllableEntity* entity, bool callback)
-    {
-        if (entity && this->controllableEntity_ == entity)
-        {
-            this->controllableEntity_ = 0;
-            this->controllableEntityID_ = OBJECTID_UNKNOWN;
-
-            if (this->controller_)
-                this->controller_->setControllableEntity(0);
-
-            if (callback)
-                entity->removePlayer();
-
-            this->changedControllableEntity();
-        }
+    void PlayerInfo::stopControl()
+    {
+        ControllableEntity* entity = this->controllableEntity_;
+
+        if (!entity)
+            return;
+
+        this->controllableEntity_ = 0;
+        this->controllableEntityID_ = OBJECTID_UNKNOWN;
+
+        if (this->controller_)
+            this->controller_->setControllableEntity(0);
+
+        entity->removePlayer();
+
+        this->changedControllableEntity();
     }
 
@@ -192 +187 @@
             Synchronisable* temp = Synchronisable::getSynchronisable(this->controllableEntityID_);
             ControllableEntity* entity = dynamic_cast<ControllableEntity*>(temp);
-
             this->startControl(entity);
         }
         else
         {
-            this->stopControl(this->controllableEntity_);
+            this->stopControl();
         }
     }

code/trunk/src/orxonox/objects/infos/PlayerInfo.h

@@ -68 +68 @@
                 { return this->bReadyToSpawn_; }
 
-            void startControl(ControllableEntity* entity, bool callback = true);
-            void stopControl(ControllableEntity* entity, bool callback = true);
+            void startControl(ControllableEntity* entity);
+            void stopControl();
 
             inline ControllableEntity* getControllableEntity() const