Changeset 3038 for code/trunk/src/orxonox/objects/gametypes/Gametype.cc

Timestamp:

May 24, 2009, 5:42:50 PM (15 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.

File:

• code/trunk/src/orxonox/objects/gametypes/Gametype.cc (modified) (5 diffs)

code/trunk/src/orxonox/objects/gametypes/Gametype.cc

@@ -130 +130 @@
             {
                 ControllableEntity* oldentity = it->first->getControllableEntity();
-        
+
                 ControllableEntity* entity = this->defaultControllableEntity_.fabricate(oldentity->getCreator());
                 if (oldentity->getCamera())
@@ -143 +143 @@
                 }
 
-                it->first->stopControl(oldentity, true);
                 it->first->startControl(entity);
             }
@@ -421 +420 @@
 
     void Gametype::addTime(float t)
-    { 
+    {
         if (this->timeLimit_ == 0)
           this->time_ -= t;
@@ -429 +428 @@
 
     void Gametype::removeTime(float t)
-    { 
+    {
         if (this->timeLimit_ == 0)
           this->time_ += t;
@@ -437 +436 @@
 
     void Gametype::resetTimer()
-    { 
+    {
         this->resetTimer(timeLimit_);
     }
 
     void Gametype::resetTimer(float t)
-    { 
+    {
         this->timeLimit_ = t;
         this->time_ = t;