X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fserver%2Fweapons%2Fthrowing.qc;h=af148393255aea59b5ab3902b165ed98b3d4f3a3;hb=5d929ee0b1dc587e3154a4fa4b56e83b9ba9100b;hp=4c140a711dc992d0856435bf21011fbadfdb217f;hpb=3fc2359b7933352424af07db8f84cbb9342e934f;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/weapons/throwing.qc b/qcsrc/server/weapons/throwing.qc index 4c140a711..af1483932 100644 --- a/qcsrc/server/weapons/throwing.qc +++ b/qcsrc/server/weapons/throwing.qc @@ -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; }