Changeset 10289 in orxonox.OLD for branches/playability/src/world_entities/space_ships/space_ship.cc

Timestamp:

Jan 17, 2007, 10:39:50 PM (17 years ago)

Author:

nicolasc

Message:

clenup

File:

• branches/playability/src/world_entities/space_ships/space_ship.cc (modified) (2 diffs)

branches/playability/src/world_entities/space_ships/space_ship.cc

@@ -823 +823 @@
         this->travelNode->setAbsCoor(this->getAbsCoor());
         this->travelNode->updateNode(0.01f);
-        
+
         this->setParent(this->travelNode);
-        
-        // If track exists put travelNode on trackNode of track
-        if (this->entityTrack)
-           this->travelNode->setParent(this->entityTrack->getTrackNode());
-           
-        
-        
         this->setRelCoor(0,0,0);
 
         State::getCameraNode()->setParentSoft(this->travelNode);
-        //State::getCameraNode()->setParentSoft(this->entityTrack->getTrackNode());
+        //State::getCameraNode()->setParentSoft(this);
         //State::getCameraNode()->setRelCoorSoft(-0.01, 40, 0);
         State::getCameraTargetNode()->setParentSoft(this->travelNode);
-        //State::getCameraTargetNode()->setParentSoft(this->entityTrack->getTrackNode());
+        //State::getCameraTargetNode()->setParentSoft(this);
         //State::getCameraTargetNode()->setRelCoorSoft(0,0,0);
         this->setCameraMode(Camera::ViewTop);
@@ -1011 +1004 @@
 
     //this moves camera and ship along the travel path.
-    if (!this->entityTrack)
-       this->travelNode->shiftCoor(Vector(this->cameraSpeed * dt, 0, 0));
+    this->travelNode->shiftCoor(Vector(this->cameraSpeed * dt, 0, 0));
 
     break;