X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_weaponsystem.qc;h=f3d675f35e71a3000ef814d410c43930cb959b59;hp=0c442d2af24bd9bd12ad0cc907d2c0a45d4c27c4;hb=53892b37b4ba4903ef7bdd8f8429158460f3cc53;hpb=786db02b0c9aa618c581b7c3fe7392ad114797d8 diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc index 0c442d2af..f3d675f35 100644 --- a/qcsrc/server/cl_weaponsystem.qc +++ b/qcsrc/server/cl_weaponsystem.qc @@ -541,20 +541,20 @@ void CL_Weaponentity_Think() } self.angles = '0 0 0'; - + float f = (self.owner.weapon_nextthink - time); if (self.state == WS_RAISE && !intermission_running) { entity newwep = get_weaponinfo(self.owner.switchweapon); f = f * g_weaponratefactor / max(f, cvar(sprintf("g_balance_%s_switchdelay_raise", newwep.netname))); - //print(sprintf("CL_Weaponentity_Think(): cvar: %s, value: %f, nextthink: %f\n", sprintf("g_balance_%s_switchdelay_raise", newwep.netname), cvar(sprintf("g_balance_%s_switchdelay_raise", newwep.netname)), (self.owner.weapon_nextthink - time))); + //printf("CL_Weaponentity_Think(): cvar: %s, value: %f, nextthink: %f\n", sprintf("g_balance_%s_switchdelay_raise", newwep.netname), cvar(sprintf("g_balance_%s_switchdelay_raise", newwep.netname)), (self.owner.weapon_nextthink - time)); self.angles_x = -90 * f * f; } else if (self.state == WS_DROP && !intermission_running) { entity oldwep = get_weaponinfo(self.owner.weapon); f = 1 - f * g_weaponratefactor / max(f, cvar(sprintf("g_balance_%s_switchdelay_drop", oldwep.netname))); - //print(sprintf("CL_Weaponentity_Think(): cvar: %s, value: %f, nextthink: %f\n", sprintf("g_balance_%s_switchdelay_drop", oldwep.netname), cvar(sprintf("g_balance_%s_switchdelay_drop", oldwep.netname)), (self.owner.weapon_nextthink - time))); + //printf("CL_Weaponentity_Think(): cvar: %s, value: %f, nextthink: %f\n", sprintf("g_balance_%s_switchdelay_drop", oldwep.netname), cvar(sprintf("g_balance_%s_switchdelay_drop", oldwep.netname)), (self.owner.weapon_nextthink - time)); self.angles_x = -90 * f * f; } else if (self.state == WS_CLEAR) @@ -667,7 +667,7 @@ float client_hasweapon(entity cl, float wpn, float andammo, float complain) complain = 0; if(complain) self.hasweapon_complain_spam = time + 0.2; - + if(wpn == WEP_HOOK && !g_grappling_hook && autocvar_g_nades && !((cl.weapons | weaponsInMap) & WepSet_FromWeapon(wpn))) complain = 0; @@ -851,7 +851,7 @@ float weapon_prepareattack_checkammo(float secondary) { W_SwitchToOtherWeapon(self); } - + return FALSE; } return TRUE; @@ -1129,7 +1129,7 @@ vector W_CalculateProjectileSpread(vector forward, float spread) if(spread <= 0) return forward; sstyle = autocvar_g_projectiles_spread_style; - + if(sstyle == 0) { // this is the baseline for the spread value!