Changeset 11071 for code/trunk/src/modules/overlays/hud/HUDWeaponMode.cc

Timestamp:

Jan 17, 2016, 10:29:21 PM (8 years ago)

Author:

landauf

Message:

merged branch cpp11_v3 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/overlays/hud/HUDWeaponMode.cc (modified) (6 diffs)

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

@@ -29 +29 @@
 #include "HUDWeaponMode.h"
 
+#include "util/Convert.h"
+#include "util/StringUtils.h"
 #include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
-#include "util/Convert.h"
 #include "core/class/Super.h"
 
@@ -76 +76 @@
         textOverlayLeft_->setPickPoint(Vector2(0.0f,0.0f));
         textOverlayLeft_->setVisible(true);
-        textOverlayLeft_->setAlignment(OverlayText::Center);
+        textOverlayLeft_->setAlignment(OverlayText::Alignment::Center);
         textOverlayLeft_->setTextSize(0.02f);
         textOverlayLeft_->setColour(ColourValue(0.21,0.70,0.21,1.0));
@@ -87 +87 @@
         textOverlayRight_->setPickPoint(Vector2(0.0f,0.0f));
         textOverlayRight_->setVisible(true);
-        textOverlayRight_->setAlignment(OverlayText::Center);
+        textOverlayRight_->setAlignment(OverlayText::Alignment::Center);
         textOverlayRight_->setTextSize(0.02f);
         textOverlayRight_->setColour(ColourValue(0.21,0.70,0.21,1.0));
@@ -107 +107 @@
     }
 
-    void HUDWeaponMode::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-    {
-        SUPER(HUDWeaponMode, XMLPort, xmlelement, mode);
-    }
-
     void HUDWeaponMode::tick(float dt)
     {
@@ -131 +126 @@
             Munition* munition = this->weaponMode_->getMunition();
 
-            if (munition != NULL)
-            {
-                MunitionDeployment::Value deployment = munition->getMunitionDeployment();
+            if (munition != nullptr)
+            {
+                MunitionDeployment deployment = munition->getMunitionDeployment();
 
                 if (deployment == MunitionDeployment::Share)
@@ -242 +237 @@
         Munition* munition = this->weaponMode_->getMunition();
 
-        if (munition != NULL)
-        {
-            MunitionDeployment::Value deployment = munition->getMunitionDeployment();
+        if (munition != nullptr)
+        {
+            MunitionDeployment deployment = munition->getMunitionDeployment();
 
             if (deployment == MunitionDeployment::Share)