Changeset 11000 for code/branches/cpp11_v2/src/modules

Timestamp:

Dec 30, 2015, 3:17:35 PM (9 years ago)

Author:

landauf

Message:

using strongly typed enum classes for RadarViewable::Shape

Location:

code/branches/cpp11_v2/src/modules

Files:

• gametypes/OldRaceCheckPoint.cc (modified) (1 diff)
• gametypes/RaceCheckPoint.cc (modified) (1 diff)
• objects/triggers/CheckPoint.cc (modified) (1 diff)
• overlays/hud/HUDRadar.cc (modified) (1 diff)
• portals/PortalEndPoint.cc (modified) (1 diff)
• weapons/projectiles/GravityBombField.cc (modified) (1 diff)
• weapons/projectiles/Rocket.cc (modified) (1 diff)
• weapons/projectiles/RocketOld.cc (modified) (1 diff)
• weapons/projectiles/SimpleRocket.cc (modified) (1 diff)

code/branches/cpp11_v2/src/modules/gametypes/OldRaceCheckPoint.cc

@@ -49 +49 @@
 
         this->setRadarObjectColour(ColourValue::Blue);
-        this->setRadarObjectShape(RadarViewable::Triangle);
+        this->setRadarObjectShape(RadarViewable::Shape::Triangle);
         this->setRadarVisibility(false);
     }

code/branches/cpp11_v2/src/modules/gametypes/RaceCheckPoint.cc

@@ -53 +53 @@
 
         this->setRadarObjectColour(ColourValue::Blue);
-        this->setRadarObjectShape(RadarViewable::Triangle);
+        this->setRadarObjectShape(RadarViewable::Shape::Triangle);
         this->setRadarVisibility(false);
         this->settingsChanged();

code/branches/cpp11_v2/src/modules/objects/triggers/CheckPoint.cc

@@ -56 +56 @@
 
         this->setRadarObjectColour(ColourValue::Green);
-        this->setRadarObjectShape(RadarViewable::Dot);
+        this->setRadarObjectShape(RadarViewable::Shape::Dot);
         this->setRadarVisibility(false);
 

code/branches/cpp11_v2/src/modules/overlays/hud/HUDRadar.cc

@@ -65 +65 @@
         this->setMaximumDotSize3D(0.07f);
 
-        this->shapeMaterials_[RadarViewable::Dot]      = "RadarDot.png";
-        this->shapeMaterials_[RadarViewable::Triangle] = "RadarTriangle.png";
-        this->shapeMaterials_[RadarViewable::Square]   = "RadarSquare.png";
+        this->shapeMaterials_[RadarViewable::Shape::Dot]      = "RadarDot.png";
+        this->shapeMaterials_[RadarViewable::Shape::Triangle] = "RadarTriangle.png";
+        this->shapeMaterials_[RadarViewable::Shape::Square]   = "RadarSquare.png";
         this->owner_ = nullptr;
 

code/branches/cpp11_v2/src/modules/portals/PortalEndPoint.cc

@@ -57 +57 @@
 
         this->setRadarObjectColour(ColourValue::White);
-        this->setRadarObjectShape(RadarViewable::Dot);
+        this->setRadarObjectShape(RadarViewable::Shape::Dot);
         this->setRadarVisibility(true);
         if( GameMode::isMaster() )

code/branches/cpp11_v2/src/modules/weapons/projectiles/GravityBombField.cc

@@ -41 +41 @@
         //Make the Field visible on Radar and minimap.
         this->setRadarObjectColour(ColourValue(1.0, 0.0, 0.2,1)); // Red
-        this->setRadarObjectShape(RadarViewable::Dot);
+        this->setRadarObjectShape(RadarViewable::Shape::Dot);
         this->setRadarObjectScale(1.0f);
         

code/branches/cpp11_v2/src/modules/weapons/projectiles/Rocket.cc

@@ -128 +128 @@
 
         this->setRadarObjectColour(ColourValue(1.0, 0.5, 0.0)); // orange
-        this->setRadarObjectShape(RadarViewable::Triangle);
+        this->setRadarObjectShape(RadarViewable::Shape::Triangle);
         this->setRadarObjectScale(0.5f);
     }

code/branches/cpp11_v2/src/modules/weapons/projectiles/RocketOld.cc

@@ -128 +128 @@
 
         this->setRadarObjectColour(ColourValue(1.0, 0.5, 0.0)); // orange
-        this->setRadarObjectShape(RadarViewable::Triangle);
+        this->setRadarObjectShape(RadarViewable::Shape::Triangle);
         this->setRadarObjectScale(0.5f);
     }

code/branches/cpp11_v2/src/modules/weapons/projectiles/SimpleRocket.cc

@@ -101 +101 @@
 
         this->setRadarObjectColour(ColourValue(1.0, 1.0, 0.0)); // yellow
-        this->setRadarObjectShape(RadarViewable::Triangle);
+        this->setRadarObjectShape(RadarViewable::Shape::Triangle);
         this->setRadarObjectScale(0.5f);
     }