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

Timestamp:

Nov 9, 2015, 5:55:42 PM (9 years ago)

Author:

fvultier

Message:

Munition may and must now be defined for each pawn separately. This way a heavy cruiser may carry more munition than a drone.

File:

• code/branches/fabienHS15/src/modules/overlays/hud/HUDWeaponMode.cc (modified) (4 diffs)

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

@@ -73 +73 @@
         this->textOverlayLeft_ = new OverlayText(this->getContext());
         assert(this->textOverlayLeft_.get());
-        this->textOverlayLeft_->setCaption("???");
+        this->textOverlayLeft_->setCaption("?");
         textOverlayLeft_->setPickPoint(Vector2(0.0f,0.0f));
         textOverlayLeft_->setVisible(true);
@@ -83 +83 @@
         
         this->textOverlayRight_ = new OverlayText(this->getContext());
-        assert(this->textOverlayLeft_.get());
-        this->textOverlayRight_->setCaption("???");
+        assert(this->textOverlayRight_.get());
+        this->textOverlayRight_->setCaption("?");
         textOverlayRight_->setPickPoint(Vector2(0.0f,0.0f));
         textOverlayRight_->setVisible(true);
@@ -93 +93 @@
         textOverlayRight_->setZOrder(600);
 
-        materialNameState_ = "Orxonox/WSHUD_Reloading";
+        materialNameState_ = "Orxonox/WSHUD_Empty";
 
         overlayElementReplenish_->setMaterialName("Orxonox/WSHUD_Replenish");
@@ -155 +155 @@
                     materialNameState_ = "Orxonox/WSHUD_Empty";
                 }
-            }
-
-            if (munition->isA(Class(ReplenishingMunition)))
-            {
-                ReplenishingMunition* replenishingMunition = dynamic_cast<ReplenishingMunition*>(munition);
-
-                if (replenishingMunition->canAddMunition(1))
-                {
-                    float progress = 1.0f - replenishingMunition->getProgress();
-                    overlayElementReplenish_->setDimensions(1.0f,progress);                    
-                }
-                else
-                {
-                    overlayElementReplenish_->setDimensions(1.0f,1.0f);
+
+                if (munition->isA(Class(ReplenishingMunition)))
+                {
+                    ReplenishingMunition* replenishingMunition = dynamic_cast<ReplenishingMunition*>(munition);
+
+                    if (replenishingMunition->canAddMunition(1))
+                    {
+                        float progress = 1.0f - replenishingMunition->getProgress();
+                        overlayElementReplenish_->setDimensions(1.0f,progress);                    
+                    }
+                    else
+                    {
+                        overlayElementReplenish_->setDimensions(1.0f,1.0f);
+                    }
                 }
             }