Merge branch 'master' into terencehill/music_player

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / weapons / weaponsystem.qc

diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc
index df3380116c4500719aa48e87a43cf95196faed08..25fce59a15f510d878355f0b084f2bf0be54bc03 100644 (file)
--- a/qcsrc/server/weapons/weaponsystem.qc
+++ b/qcsrc/server/weapons/weaponsystem.qc
@@ -641,6 +641,8 @@ float forbidWeaponUse()
                return 1;
        if(self.frozen)
                return 1;
+       if(self.weapon_blocked)
+               return 1;
        return 0;
 }
 
@@ -689,7 +691,7 @@ void W_WeaponFrame()
                        self.weapon = self.switchweapon;
                        self.weaponname = newwep.mdl;
                        self.bulletcounter = 0;
-                       //self.ammo_field = newwep.ammo_field;
+                       self.ammo_field = newwep.ammo_field;
                        WEP_ACTION(self.switchweapon, WR_SETUP);
                        self.weaponentity.state = WS_RAISE;
 
@@ -811,6 +813,13 @@ void W_DecreaseAmmo(float ammo_use)
 {
        entity wep = get_weaponinfo(self.weapon);
 
+       if(cvar("g_overkill"))
+       if(self.ok_use_ammocharge)
+       {
+               ok_DecreaseCharge(self, self.weapon);
+               return; // TODO
+       }
+
        if((self.items & IT_UNLIMITED_WEAPON_AMMO) && !wep.reloading_ammo)
                return;
 
@@ -855,11 +864,10 @@ void W_ReloadedAndReady()
                self.clip_load = self.reload_ammo_amount;
        else
        {
-               while(self.clip_load < self.reload_ammo_amount && self.(self.ammo_field)) // make sure we don't add more ammo than we have
-               {
-                       self.clip_load += 1;
-                       self.(self.ammo_field) -= 1;
-               }
+               // make sure we don't add more ammo than we have
+               float load = min(self.reload_ammo_amount - self.clip_load, self.(self.ammo_field));
+        self.clip_load += load;
+        self.(self.ammo_field) -= load;
        }
        self.(weapon_load[self.weapon]) = self.clip_load;
 
@@ -878,8 +886,12 @@ void W_Reload(float sent_ammo_min, string sent_sound)
        entity e;
        e = get_weaponinfo(self.weapon);
 
+       if(cvar("g_overkill"))
+       if(self.ok_use_ammocharge)
+               return; // TODO
+
        self.reload_ammo_min = sent_ammo_min;
-       self.reload_ammo_amount = e.reloading_ammo;;
+       self.reload_ammo_amount = e.reloading_ammo;
        self.reload_time = e.reloading_time;
        self.reload_sound = sent_sound;