Fix Ammunitioning nade if other ammo is filled

diff --git a/qcsrc/common/mutators/mutator/nades/nades.qc b/qcsrc/common/mutators/mutator/nades/nades.qc
index a5b4a39c32a542452dd2c4289caafb425c6ac94d..0818c9ca4da3d9ddbddb14a9097ff000fbc04a03 100644 (file)
--- a/qcsrc/common/mutators/mutator/nades/nades.qc
+++ b/qcsrc/common/mutators/mutator/nades/nades.qc
@@ -805,16 +805,48 @@ void nade_ammo_touch(entity this, entity toucher)
                }
                if ( ammo_factor > 0 )
                {
-                       if ((amshells < maxammo) && (ambullets < maxammo) && (amrockets < maxammo) && (amcells < maxammo) && (amplasma < maxammo))
+                       if (amshells < maxammo)
                        {
                                if (this.nade_show_particles)
                                {
                                        Send_Effect(EFFECT_HEALING, toucher.origin, '0 0 0', 1);
                                }
                                GiveResourceWithLimit(toucher, RES_SHELLS, ammo_factor, maxammo);
+                       }
+
+                       if (ambullets < maxammo) 
+                       {
+                               if (this.nade_show_particles)
+                               {
+                                       Send_Effect(EFFECT_HEALING, toucher.origin, '0 0 0', 1);
+                               }
                                GiveResourceWithLimit(toucher, RES_BULLETS, ammo_factor, maxammo);
+                       }
+
+                       if (amrockets < maxammo)
+                       {
+                               if (this.nade_show_particles)
+                               {
+                                       Send_Effect(EFFECT_HEALING, toucher.origin, '0 0 0', 1);
+                               }
                                GiveResourceWithLimit(toucher, RES_ROCKETS, ammo_factor, maxammo);
+                       }
+
+                       if (amcells < maxammo) 
+                       {
+                               if (this.nade_show_particles)
+                               {
+                                       Send_Effect(EFFECT_HEALING, toucher.origin, '0 0 0', 1);
+                               }
                                GiveResourceWithLimit(toucher, RES_CELLS, ammo_factor, maxammo);
+                       }
+
+                       if (amplasma < maxammo)
+                       {
+                               if (this.nade_show_particles)
+                               {
+                                       Send_Effect(EFFECT_HEALING, toucher.origin, '0 0 0', 1);
+                               }
                                GiveResourceWithLimit(toucher, RES_PLASMA, ammo_factor, maxammo);
                        }
                }