Changeset 1384 for code/branches

Timestamp:

May 22, 2008, 4:55:24 PM (16 years ago)

Author:

scheusso

Message:

changed radar handling (SpaceShip::instance is now SpaceShip::getLocalShip)

Location:

code/branches/network/src/orxonox/hud

Files:

• HUD.cc (modified) (1 diff)
• RadarOverlayElement.cc (modified) (1 diff)

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

@@ -104 +104 @@
         energyBar->resize();
 
-        float v = SpaceShip::instance_s->getVelocity().length();
-        float vmax = SpaceShip::instance_s->getMaxSpeed();
+        float v = SpaceShip::getLocalShip()->getVelocity().length();
+        float vmax = SpaceShip::getLocalShip()->getMaxSpeed();
         speedoBar->setValue(v/vmax);
         speedoBar->resize();

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

@@ -91 +91 @@
 
     void RadarOverlayElement::update() {
-        shipPos_ = SpaceShip::instance_s->getPosition();
-        currentDir_ = SpaceShip::instance_s->getOrientation()*initialDir_;              // according to beni....
-                currentOrth_ = SpaceShip::instance_s->getOrientation()*initialOrth_;
+        shipPos_ = SpaceShip::getLocalShip()->getPosition();
+        currentDir_ = SpaceShip::getLocalShip()->getOrientation()*initialDir_;          // according to beni....
+                currentOrth_ = SpaceShip::getLocalShip()->getOrientation()*initialOrth_;
         plane = Plane(currentDir_, shipPos_);