Changeset 6241 in orxonox.OLD for trunk/src/world_entities/player.cc

Timestamp:

Dec 21, 2005, 3:36:25 PM (20 years ago)

Author:

bensch

Message:

trunk: merged the spaceshipcontrol back to the trunk

File:

• trunk/src/world_entities/player.cc (modified) (1 diff)

trunk/src/world_entities/player.cc

@@ -95 +95 @@
          if (this->controllable != (*node) && (dynamic_cast<PNode*>(*node)->getAbsCoor() - this->controllable->getAbsCoor()).len() < 10.0)
        {
-         this->controllable->leave();
+ 
          this->disconnectControllable();
          this->setControllable(dynamic_cast<Playable*>(*node));
-         this->controllable->enter();
-         State::getCamera()->setParentSoft(this->controllable);
-         State::getCameraTarget()->setParentSoft(this->controllable);
 
          break;