From: Mircea Kitsune Date: Sat, 2 Apr 2011 23:13:37 +0000 (+0300) Subject: Also make a client side cvar switch X-Git-Tag: xonotic-v0.6.0~110^2^2~160 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a31fdc40ac777dc34134fca5a28dd2f55c7ecf52;p=xonotic%2Fxonotic-data.pk3dir.git Also make a client side cvar switch --- diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 2a4d0d954..27020a5e6 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 cl_damageeffect 1 "enable weapon damage effects on players" set g_respawn_ghosts 1 "if 1 dead bodies become ghosts and float away when the player respawns" set g_respawn_ghosts_speed 5 "the speed with which respawn ghosts float and rotate" diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh index e11266ce0..ec1581973 100644 --- a/qcsrc/client/autocvars.qh +++ b/qcsrc/client/autocvars.qh @@ -305,3 +305,4 @@ float autocvar_viewsize; float autocvar_crosshair_color_by_health; float autocvar_cl_hitsound; float autocvar_cl_hitsound_antispam_time; +float autocvar_cl_damageeffect; diff --git a/qcsrc/client/gibs.qc b/qcsrc/client/gibs.qc index e1eecb56f..ee70fde77 100644 --- a/qcsrc/client/gibs.qc +++ b/qcsrc/client/gibs.qc @@ -288,6 +288,8 @@ void Ent_DamageEffect() org_y = ReadCoord(); org_z = ReadCoord(); + if not(autocvar_cl_damageeffect) + return; if(autocvar_cl_gentle || autocvar_cl_gentle_damage) return; diff --git a/qcsrc/server/g_violence.qc b/qcsrc/server/g_violence.qc index fc19f92be..e78ae20d9 100644 --- a/qcsrc/server/g_violence.qc +++ b/qcsrc/server/g_violence.qc @@ -81,11 +81,10 @@ void Violence_DamageEffect_DoRepeat() void Violence_DamageEffect_SetRepeat(entity pl, float damage, float type) { - // return if gentle mode is enabled or the damage was not caused by a weapon - if(sv_gentle || !type) - return; if not(autocvar_sv_damageeffect_tick && autocvar_sv_damageeffect_lifetime) return; + if(sv_gentle || !type) + return; // return if gentle mode is enabled or the damage was not caused by a weapon // if a repeater doesn't exist, spawn one, else update the existing one if(pl.damageeffect_repeater == world)