Changeset 9257 for code/trunk/src/modules/overlays

Timestamp:

May 28, 2012, 12:28:44 PM (13 years ago)

Author:

landauf

Message:

renamed RVName to radarname
cast to RadarViewable instead of SpaceShip to set the name (in PlayerInfo)

File:

• code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) (7 diffs)

code/trunk/src/modules/overlays/hud/HUDNavigation.cc

@@ -79 +79 @@
     this->setTextSize ( 0.05f );
     this->setNavMarkerSize ( 0.05f );
-    this->setDetectionLimit( 10000.0f ); 
+    this->setDetectionLimit( 10000.0f );
 }
 
@@ -101 +101 @@
     XMLPortParam ( HUDNavigation, "textSize",      setTextSize,      getTextSize,      xmlelement, mode );
     XMLPortParam ( HUDNavigation, "navMarkerSize", setNavMarkerSize, getNavMarkerSize, xmlelement, mode );
-    XMLPortParam ( HUDNavigation, "detectionLimit", setDetectionLimit, getDetectionLimit, xmlelement, mode ); 
+    XMLPortParam ( HUDNavigation, "detectionLimit", setDetectionLimit, getDetectionLimit, xmlelement, mode );
 }
 
@@ -146 +146 @@
 
 float HUDNavigation::getArrowSizeX(int dist)
-{    
-    if (dist < 600) 
+{
+    if (dist < 600)
         dist = 600;
     return this->getActualSize().x * 900 * navMarkerSize_ / dist;
@@ -153 +153 @@
 
 float HUDNavigation::getArrowSizeY(int dist)
-{    
+{
     if (dist < 600)
-        dist = 600;   
+        dist = 600;
     return this->getActualSize().y * 900 * navMarkerSize_ / dist;
 }
@@ -184 +184 @@
         ObjectMap::iterator it = activeObjectList_.find ( listIt->first );
         closeEnough_ = listIt->second < detectionLimit_ ;
-        // display radarviewables on HUD if the marker limit and max-distance is not exceeded 
-        if ( markerCount_ < markerLimit_ && (closeEnough_ ||  detectionLimit_ < 0) ) 
+        // display radarviewables on HUD if the marker limit and max-distance is not exceeded
+        if ( markerCount_ < markerLimit_ && (closeEnough_ ||  detectionLimit_ < 0) )
         {
 
@@ -201 +201 @@
             //display name next to cursor
             else{
-            it->second.text_->setCaption(it->first->getRVName()); 
-            textLength = it->first->getRVName().size() * it->second.text_->getCharHeight() * 0.3f;
+            it->second.text_->setCaption(it->first->getRadarName());
+            textLength = it->first->getRadarName().size() * it->second.text_->getCharHeight() * 0.3f;
             }
 
@@ -311 +311 @@
             it->second.text_->show();
         }
-        else // do not display on HUD 
+        else // do not display on HUD
         {
             it->second.panel_->hide();