Changeset 11702 for code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc

Timestamp:

Jan 6, 2018, 2:01:20 AM (6 years ago)

Author:

landauf

Message:

[HUD_HS16] removed a lot of unused stuff

File:

• code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc (modified) (3 diffs)

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

@@ -30 +30 @@
 #include <string>
 
+#include <OgreOverlayManager.h>
+#include <OgrePanelOverlayElement.h>
+
 #include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
-#include "util/Convert.h"
 #include "core/class/Super.h"
+#include "util/StringUtils.h"
 #include "HUDPickupSystem.h"
+#include "HUDPickupItem.h"
 #include "pickup/Pickup.h"
-#include "HUDPickupItem.h"
 #include "pickup/PickupManager.h"
 
@@ -68 +70 @@
         //hide all pickup symbols in HUD and delete from local map
         
-        for(const auto& sm_pair : picks)
+        for(HUDPickupItem* item : items_)
         {
-            sm_pair.second->hideMe(sm_pair.first, repaint);
+            item->hideMe();
         }
 
-        picks.clear();
-        assert(picks.empty()); //picks must be empty now
+        items_.clear();
+        assert(items_.empty()); //items_ must be empty now
 
         //add to local map and place on screen
@@ -95 +97 @@
             item->initializeMaterial(this->getIcon(((Pickup*)pickup)->getRepresentationName()), offsetX+i*x, offsetY);
             item->setOverlayGroup(this->getOverlayGroup());
-            picks[pickup] = item;
+            items_.push_back(item);
         }
-    }
-
-    
-    void HUDPickupSystem::destroyAll()
-    {
-        this->background_->removeChild(overlayElement_->getName());
     }