Changeset 11059 for code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponSystem.cc

Timestamp:

Jan 13, 2016, 10:19:21 PM (8 years ago)

Author:

landauf

Message:

return const-ref to collections instead of pointer

File:

• code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponSystem.cc (modified) (1 diff)

code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponSystem.cc

@@ -126 +126 @@
         destroyHUDChilds();
 
-        std::vector<WeaponPack*>* weaponPacks = owner_->getAllWeaponPacks();
+        if (owner_->getWeaponSystem())
+        {
+            const std::vector<WeaponPack*>& weaponPacks = owner_->getWeaponSystem()->getAllWeaponPacks();
 
-        for (std::vector<WeaponPack*>::const_iterator itPacks = weaponPacks->begin(); itPacks != weaponPacks->end(); ++itPacks)
-        {
-            std::vector<Weapon*>* weapons = (*itPacks)->getAllWeapons();
+            for (std::vector<WeaponPack*>::const_iterator itPacks = weaponPacks.begin(); itPacks != weaponPacks.end(); ++itPacks)
+            {
+                const std::vector<Weapon*>& weapons = (*itPacks)->getAllWeapons();
 
-            for (std::vector<Weapon*>::const_iterator itWeapons = weapons->begin(); itWeapons != weapons->end(); ++itWeapons)
-            {
-                this->weapons_.push_back(*itWeapons);
+                for (std::vector<Weapon*>::const_iterator itWeapons = weapons.begin(); itWeapons != weapons.end(); ++itWeapons)
+                {
+                    this->weapons_.push_back(*itWeapons);
+                }
             }
+
+            createHUDChilds();
+            positionHUDChilds();
         }
-
-        createHUDChilds();
-        positionHUDChilds();
     }