Changeset 2908 for code/branches/questsystem5/src/orxonox/objects/infos/PlayerInfo.cc

Timestamp:

Apr 8, 2009, 12:58:47 AM (16 years ago)

Author:

dafrick

Message:

Reverted to revision 2906 (because I'm too stupid to merge correctly, 2nd try will follow shortly. )

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/orxonox/objects/infos/PlayerInfo.cc (modified) (3 diffs)

code/branches/questsystem5/src/orxonox/objects/infos/PlayerInfo.cc

@@ -110 +110 @@
     void PlayerInfo::createController()
     {
-        if (this->controller_)
-        {
-            delete this->controller_;
-            this->controller_ = 0;
-        }
         this->controller_ = this->defaultController_.fabricate(this);
         assert(this->controller_);
@@ -146 +141 @@
         if (this->controller_)
             this->controller_->setControllableEntity(entity);
-
-        this->changedControllableEntity();
     }
 
@@ -162 +155 @@
             if (callback)
                 entity->removePlayer();
-
-            this->changedControllableEntity();
         }
     }