From: Mircea Kitsune Date: Mon, 4 Apr 2011 12:54:19 +0000 (+0300) Subject: Bound the maximum lifetime the effect might have at a time (server side). Currently... X-Git-Tag: xonotic-v0.6.0~110^2^2~131 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=91d8b2a74e3b94a0892f36fb97efd4be6748e0f9;p=xonotic%2Fxonotic-data.pk3dir.git Bound the maximum lifetime the effect might have at a time (server side). Currently defaulted to 8 seconds. --- diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index fa262cbb9..458899837 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -351,6 +351,7 @@ set g_teleport_maxspeed 0 "maximum speed that a player can keep when going throu set sv_damageeffect_tick 0.05 "how often the damage effect is updated (particles per second), low values might cause lag" set sv_damageeffect_lifetime 0.1 "how much a damage effect lasts, multiplied by damage amount" +set sv_damageeffect_lifetime_max 8 "maximum amount of lifetime a damage effect may have at a time" set cl_damageeffect 1 "enable weapon damage effects on players" set cl_damageeffect_gib_probability 0.15 "probability of effect showing on gibs each tick (used to reduce the effect on gibs)" diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh index 815650bb6..bce1ab279 100644 --- a/qcsrc/server/autocvars.qh +++ b/qcsrc/server/autocvars.qh @@ -1217,6 +1217,7 @@ string autocvar_sv_weaponstats_file; float autocvar_sv_gibhealth; float autocvar_sv_damageeffect_tick; float autocvar_sv_damageeffect_lifetime; +float autocvar_sv_damageeffect_lifetime_max; float autocvar_sys_ticrate; float autocvar_teamplay_lockonrestart; float autocvar_teamplay_mode; diff --git a/qcsrc/server/g_violence.qc b/qcsrc/server/g_violence.qc index e5a308316..699ff2136 100644 --- a/qcsrc/server/g_violence.qc +++ b/qcsrc/server/g_violence.qc @@ -120,6 +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); + pl.damageeffect_repeater.cnt = type; pl.damageeffect_repeater.nextthink = time; }