From: Mircea Kitsune Date: Mon, 4 Apr 2011 13:54:38 +0000 (+0300) Subject: Only bound the effect's lifetime if the cvar is enabled. X-Git-Tag: xonotic-v0.6.0~110^2^2~130 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f3da5f83d5dc80b924f57b70ddee0a115692f830;p=xonotic%2Fxonotic-data.pk3dir.git Only bound the effect's lifetime if the cvar is enabled. --- diff --git a/qcsrc/server/g_violence.qc b/qcsrc/server/g_violence.qc index 699ff2136..48fe8a165 100644 --- a/qcsrc/server/g_violence.qc +++ b/qcsrc/server/g_violence.qc @@ -120,7 +120,8 @@ void Violence_DamageEffect_SetRepeat(entity pl, float damage, float type) pl.damageeffect_repeater.lifetime += (autocvar_sv_damageeffect_lifetime * damage); } - pl.damageeffect_repeater.lifetime = bound(0, pl.damageeffect_repeater.lifetime, time + autocvar_sv_damageeffect_lifetime_max); + if(autocvar_sv_damageeffect_lifetime_max) + pl.damageeffect_repeater.lifetime = bound(0, pl.damageeffect_repeater.lifetime, time + autocvar_sv_damageeffect_lifetime_max); pl.damageeffect_repeater.cnt = type; pl.damageeffect_repeater.nextthink = time;