Changeset 6216 in orxonox.OLD

Timestamp:

Dec 21, 2005, 11:52:20 AM (18 years ago)

Author:

bensch

Message:

christmas: chaging of entities works

File:

• branches/christmas_branche/src/world_entities/player.cc (modified) (2 diffs)

branches/christmas_branche/src/world_entities/player.cc

@@ -21 +21 @@
 
 #include "class_list.h"
+#include "state.h"
 
 using namespace std;
@@ -94 +95 @@
          if (this->controllable != (*node) && (dynamic_cast<PNode*>(*node)->getAbsCoor() - this->controllable->getAbsCoor()).len() < 10.0)
        {
-         printf("strange\n");
          this->disconnectControllable();
          this->setControllable(dynamic_cast<Playable*>(*node));
+         State::getCamera()->setParentSoft(this->controllable);
+         State::getCameraTarget()->setParentSoft(this->controllable);
+
          break;
        }