Changeset 11041 for code/branches/presentationHS15/src/modules/hover/FlagHUD.cc

Timestamp:

Jan 4, 2016, 6:19:07 PM (9 years ago)

Author:

landauf

Message:

cleanup in hover module

File:

• code/branches/presentationHS15/src/modules/hover/FlagHUD.cc (modified) (5 diffs)

code/branches/presentationHS15/src/modules/hover/FlagHUD.cc

@@ -36 +36 @@
 #include <OgrePanelOverlayElement.h>
 
+#include "util/StringUtils.h"
 #include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
+#include "Hover.h"
 
 namespace orxonox
@@ -47 +48 @@
         RegisterObject(FlagHUD);
 
+        this->hoverGame_ = NULL;
         this->panel_ = static_cast<Ogre::PanelOverlayElement*>(Ogre::OverlayManager::getSingleton()
             .createOverlayElement("Panel", "FlagHUD_Panel_" + getUniqueNumberString()));
@@ -54 +56 @@
         this->flagCount_ = 5;
         setFlagCount(5);
+    }
+
+    FlagHUD::~FlagHUD()
+    {
+        if (this->isInitialized())
+        {
+            Ogre::OverlayManager::getSingleton().destroyOverlayElement(this->panel_);
+        }
     }
 
@@ -78 +88 @@
         SUPER(FlagHUD, tick, dt);
 
-            setFlagCount(this->hoverGame->getFlags());
-        
+        setFlagCount(this->hoverGame_->getFlags());
     }
 
@@ -88 +97 @@
         if (this->getOwner() && this->getOwner()->getGametype())
         {
-            this->hoverGame = orxonox_cast<Hover*>(this->getOwner()->getGametype());
+            this->hoverGame_ = orxonox_cast<Hover*>(this->getOwner()->getGametype());
         }
         else
         {
-            this->hoverGame = 0;
-        }
-    }
-
-    FlagHUD::~FlagHUD()
-    {
-        if (this->isInitialized())
-        {
-            Ogre::OverlayManager::getSingleton().destroyOverlayElement(this->panel_);
+            this->hoverGame_ = 0;
         }
     }