Changeset 1408 for code/branches/network/src/orxonox/hud/RadarOverlayElement.cc

Timestamp:

May 24, 2008, 2:07:04 PM (16 years ago)

Author:

FelixSchulthess

Message:

compiles now with changes from trunk

File:

• code/branches/network/src/orxonox/hud/RadarOverlayElement.cc (modified) (1 diff)

code/branches/network/src/orxonox/hud/RadarOverlayElement.cc

@@ -78 +78 @@
 
     void RadarOverlayElement::update() {
-<<<<<<< .working
-        shipPos_ = SpaceShip::getLocalShip()->getPosition();
-        currentDir_ = SpaceShip::getLocalShip()->getOrientation()*initialDir_;          // according to beni....
-                currentOrth_ = SpaceShip::getLocalShip()->getOrientation()*initialOrth_;
-        plane = Plane(currentDir_, shipPos_);
-
-        RadarObject* ro = firstRadarObject_;
-=======
         shipPos_ = SpaceShip::getLocalShip()->getPosition();
         currentDir_ = SpaceShip::getLocalShip()->getDir();
                 currentOrth_ = SpaceShip::getLocalShip()->getOrth();
         RadarObject* ro = HUD::getSingleton().getFirstRadarObject();
->>>>>>> .merge-right.r1401
         // iterate through all RadarObjects
                 while(ro != NULL){