Changeset 9257 for code/trunk/src/orxonox/interfaces

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)

Location:

code/trunk/src/orxonox/interfaces

Files:

• RadarViewable.cc (modified) (1 diff)
• RadarViewable.h (modified) (2 diffs)

code/trunk/src/orxonox/interfaces/RadarViewable.cc

@@ -51 +51 @@
         , radarObjectDescription_("staticObject")
         , scale_(1.0f)
-                , RVName("")
     {
         RegisterRootObject(RadarViewable);

code/trunk/src/orxonox/interfaces/RadarViewable.h

@@ -61 +61 @@
         virtual ~RadarViewable();
 
-                virtual void setRVName(std::string name)
+                virtual void setRadarName(const std::string& name)
                         {
-                                if (this->RVName != name)
+                                if (this->radarName_ != name)
                                 {
-                                        this->RVName = name;
+                                        this->radarName_ = name;
                                         this->settingsChanged();
                                 }
                         }
-                std::string getRVName() const
-                        { return this->RVName; }
+                const std::string& getRadarName() const
+                        { return this->radarName_; }
 
         inline void setRadarObjectCamouflage(float camouflage)
@@ -163 +163 @@
         ColourValue radarObjectColour_;
         float scale_;
-                std::string RVName;
+                std::string radarName_;
     };
 }