Changeset 11059 for code/branches/cpp11_v3/src/modules

Timestamp:

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

Author:

landauf

Message:

return const-ref to collections instead of pointer

Location:

code/branches/cpp11_v3/src/modules/overlays/hud

Files:

• HUDWeapon.cc (modified) (6 diffs)
• HUDWeapon.h (modified) (1 diff)
• HUDWeaponSystem.cc (modified) (1 diff)

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

@@ -44 +44 @@
         weaponModeHUDActualSize_ = Vector2(0.0f,0.0f);
 
-        weaponModes_ = NULL;
         weaponIndex_ = 0;
         hudWeaponModes_.clear();
@@ -148 +147 @@
         destroyHUDChilds();
 
-        weaponModes_ = weapon_->getAllWeaponmodes();
-
         updateSize();
         createHUDChilds();
@@ -157 +154 @@
     void HUDWeapon::createHUDChilds()
     {
-        if (weaponModes_ == NULL)
+        if (weapon_ == NULL)
         {
             return;
@@ -164 +161 @@
         int positionIndex = 0;
 
-        for (std::multimap<unsigned int, WeaponMode*>::iterator it = weaponModes_->begin(); it != weaponModes_->end(); ++it)
+        for (std::multimap<unsigned int, WeaponMode*>::const_iterator it = weapon_->getAllWeaponmodes().begin(); it != weapon_->getAllWeaponmodes().end(); ++it)
         {
             HUDWeaponMode* hudWeaponMode = new HUDWeaponMode(this->getContext());
@@ -208 +205 @@
     void HUDWeapon::updateSize()
     {
-        if (weaponModes_ != NULL)
-        {
-            this->setSize(Vector2(weaponModeHUDActualSize_.x,weaponModeHUDActualSize_.y*weaponModes_->size()));
+        if (weapon_ != NULL)
+        {
+            this->setSize(Vector2(weaponModeHUDActualSize_.x,weaponModeHUDActualSize_.y*weapon_->getAllWeaponmodes().size()));
             updatePosition();
         }        
@@ -217 +214 @@
     void HUDWeapon::updatePosition()
     {
-        if (weaponModes_ != NULL)
+        if (weapon_ != NULL)
         {
             this->setPosition(Vector2(weaponModeHUDActualSize_.x*weaponIndex_,0.0f) + this->positionOffset_);

code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeapon.h

@@ -94 +94 @@
         WeakPtr<Weapon> weapon_;
 
-        std::multimap<unsigned int, WeaponMode*>* weaponModes_;
         std::vector<WeakPtr<HUDWeaponMode> > hudWeaponModes_;
 

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();
     }