Merge branch 'master' into martin-t/mg-solidpen

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

diff --git a/qcsrc/server/weapons/throwing.qc b/qcsrc/server/weapons/throwing.qc
index 9aaabb05bfafa8075ea63466e89ab0996ffe53b5..7e8a061f049b1ebc552308c796219c1b716eedbd 100644 (file)
--- a/qcsrc/server/weapons/throwing.qc
+++ b/qcsrc/server/weapons/throwing.qc
@@ -89,7 +89,7 @@ float W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vector
        wep.pickup_anyway = true; // these are ALWAYS pickable
 
        //wa = W_AmmoItemCode(wpn);
-       if(ammotype == RESOURCE_NONE)
+       if(ammotype == RES_NONE)
        {
                return 0;
        }
@@ -104,7 +104,7 @@ float W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vector
                                GiveResource(own, ammotype, own.(weaponentity).(weapon_load[i]));
                                own.(weaponentity).(weapon_load[i]) = -1; // schedule the weapon for reloading
                        }
-                       SetResourceAmount(wep, ammotype, 0);
+                       SetResource(wep, ammotype, 0);
                }
                else if(doreduce)
                {
@@ -116,10 +116,10 @@ float W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vector
                                own.(weaponentity).(weapon_load[i]) = -1; // schedule the weapon for reloading
                        }
 
-                       float ownderammo = GetResourceAmount(own, ammotype);
-                       float thisammo = min(ownderammo, GetResourceAmount(wep, ammotype));
-                       SetResourceAmount(wep, ammotype, thisammo);
-                       SetResourceAmount(own, ammotype, ownderammo - thisammo);
+                       float ownderammo = GetResource(own, ammotype);
+                       float thisammo = min(ownderammo, GetResource(wep, ammotype));
+                       SetResource(wep, ammotype, thisammo);
+                       SetResource(own, ammotype, ownderammo - thisammo);
 
                        return thisammo;
                }
@@ -134,9 +134,9 @@ bool W_IsWeaponThrowable(entity this, int w)
        if (!autocvar_g_pickup_items)
                return false;
        if (g_weaponarena)
-               return 0;
-    if(w == WEP_Null.m_id)
-        return false;
+               return false;
+       if (w == WEP_Null.m_id)
+               return false;
 
        return (Weapons_from(w)).weaponthrowable;
 }