]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Don't set min ammo counts for weapons on the map; the weapons themselves yield ammo...
authorRudolf Polzer <divverent@xonotic.org>
Tue, 22 Oct 2013 11:23:39 +0000 (13:23 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 22 Oct 2013 11:23:39 +0000 (13:23 +0200)
qcsrc/server/item_ammo.qc

index 74839114b7661cd1848848dea38781b939d0c21d..eebc3c96f3c4ebf6ff6b212f955f83749b808c39 100644 (file)
@@ -123,7 +123,7 @@ void item_ammo_pick()
                if (start_weapons & get_weaponinfo(i).weapons)
                        for (i = 0; i < ITEM_AMMO_COUNT; ++i)
                                if (get_weaponinfo(w.weapon).items & item_ammo_type(i))
-                                       item_ammo_mincount[i] = 1;
+                                       item_ammo_mincount[i] = n_teams;
        for (w = weaponlist; w; w = w.chain)
        {
                float c = 0;
@@ -143,7 +143,7 @@ void item_ammo_pick()
                        if (get_weaponinfo(w.weapon).items & item_ammo_type(i))
                        {
                                item_ammo_count[i] += item_ammo_modifier(i) * item_ammo_weaponmodifier(w.weapon) * c;
-                               item_ammo_mincount[i] = n_teams;
+                               // item_ammo_mincount[i] = n_teams;  // Not needed, weapons serve as ammo pickups too.
                        }
        }
        float n_count = 0;