From fe505e8a765d333dd0ffcce286f8f489d0521936 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 13 Nov 2014 21:51:23 +1100 Subject: [PATCH] Update stat for jumpheight in the jumpheight mutator hook (perhaps this should be a global thing...) --- qcsrc/server/mutators/mutator_buffs.qc | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/qcsrc/server/mutators/mutator_buffs.qc b/qcsrc/server/mutators/mutator_buffs.qc index bafa28c9c8..c71fe60ea9 100644 --- a/qcsrc/server/mutators/mutator_buffs.qc +++ b/qcsrc/server/mutators/mutator_buffs.qc @@ -456,7 +456,8 @@ MUTATOR_HOOKFUNCTION(buffs_PlayerPhysics) MUTATOR_HOOKFUNCTION(buffs_PlayerJump) { if(self.buffs & BUFF_JUMP) - player_jumpheight = max(autocvar_g_buffs_jump_height, player_jumpheight); + player_jumpheight = autocvar_g_buffs_jump_height; + self.stat_jumpheight = player_jumpheight; return FALSE; } @@ -550,11 +551,9 @@ MUTATOR_HOOKFUNCTION(buffs_OnEntityPreSpawn) MUTATOR_HOOKFUNCTION(buffs_WeaponRate) { if(self.buffs & BUFF_SPEED) - if(autocvar_g_buffs_speed_rate > 0) weapon_rate *= autocvar_g_buffs_speed_rate; if(time < self.buff_disability_time) - if(autocvar_g_buffs_disability_rate > 0) weapon_rate *= autocvar_g_buffs_disability_rate; return FALSE; @@ -579,11 +578,6 @@ MUTATOR_HOOKFUNCTION(buffs_PlayerThink) self.buffs = 0; } } - - if(!(self.oldbuffs & BUFF_JUMP) && !(self.buffs & BUFF_JUMP)) - self.stat_jumpheight = autocvar_sv_jumpvelocity; // reset so we don't break anything - else if((self.buffs & BUFF_JUMP) && self.stat_jumpheight != autocvar_g_buffs_jump_height) - self.stat_jumpheight = autocvar_g_buffs_jump_height; if((self.buffs & BUFF_INVISIBLE) && (self.oldbuffs & BUFF_INVISIBLE)) if(self.alpha != autocvar_g_buffs_invisible_alpha) @@ -609,11 +603,6 @@ MUTATOR_HOOKFUNCTION(buffs_PlayerThink) if(!self.ammo_fuel) { self.ammo_fuel = 20; } } - if(self.oldbuffs & BUFF_JUMP) - self.stat_jumpheight = autocvar_sv_jumpvelocity; - else if(self.buffs & BUFF_JUMP) - self.stat_jumpheight = autocvar_g_buffs_jump_height; - if(self.oldbuffs & BUFF_INVISIBLE) { if(time < self.strength_finished && g_minstagib) -- 2.39.2