Changeset 10739 for code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.cc

Timestamp:

Nov 1, 2015, 1:05:54 PM (9 years ago)

Author:

fvultier

Message:

HUD improved. Corrected text rescaling. Renamed reload to shieldRecharge in Pawn.cc, … to avoid confusion with the weapon system.

File:

• code/branches/fabienHS15/src/modules/overlays/hud/HUDWeapon.cc (modified) (3 diffs)

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

@@ -60 +60 @@
         {
             destroyHUDChilds();
-            //this->overlayElement_->destroy();            
         }
     }
@@ -179 +178 @@
         for (std::vector<WeakPtr<HUDWeaponMode> >::iterator it = hudWeaponModes_.begin(); it != hudWeaponModes_.end(); ++it)
         {
+            (*it)->setPositionOffset(this->positionOffset_);
             (*it)->setWeaponModeIndex(positionIndex);
             (*it)->setWeaponIndex(this->weaponIndex_);
@@ -210 +210 @@
         if (weaponModes_ != NULL)
         {
-            this->setPosition(Vector2(weaponModeHUDActualSize_.x*weaponIndex_,0.0f));
+            this->setPosition(Vector2(weaponModeHUDActualSize_.x*weaponIndex_,0.0f) + this->positionOffset_);
         }        
     }