Changeset 10878 for code/branches/fabienHS15/src/modules/overlays

Timestamp:

Nov 27, 2015, 6:49:54 PM (9 years ago)

Author:

fvultier

Message:

 

Location:

code/branches/fabienHS15/src/modules/overlays/hud

Files:

• HUDEnemyShieldBar.cc (modified) (1 diff)
• HUDWeaponMode.cc (modified) (1 diff)

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

@@ -71 +71 @@
                 target = target->getParent();
             pawn = orxonox_cast<Pawn*>(target);
-            // Don't show the HealthBar if the pawn is invisible
+            // Don't show the EnemyShieldBar if the pawn is invisible
             if (pawn && !pawn->isVisible())
                 pawn = NULL;
         }
-        // Set the pawn as owner of the HealthBar
+        // Set the pawn as owner of the EnemyShieldBar
         this->setShieldBarOwner(pawn);
         this->setVisible(pawn != NULL);

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

@@ -160 +160 @@
                     ReplenishingMunition* replenishingMunition = dynamic_cast<ReplenishingMunition*>(munition);
 
-                    if (replenishingMunition->canAddMunition(1))
+                    if (replenishingMunition->canAddMagazines(1))
                     {
                         float progress = 1.0f - replenishingMunition->getProgress();