Also make a client side cvar switch

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 2a4d0d9549776212af2b2fe8750b5851730e5d70..27020a5e6f01e98b1473ac4682d361d26a1ba4d3 100644 (file)
--- 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 e11266ce0223324944413047fc647a5d95314ea2..ec1581973837c5cccec99c670fbea70915d0b5f0 100644 (file)
--- 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 e1eecb56ff9c3a9477b6ccf51a4b7ae7c50415ce..ee70fde7793d1c7c5d067955c2f95f85db09184c 100644 (file)
--- 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 fc19f92bedd606721d75286444187fc9ae03df7c..e78ae20d9d76781a3e12255a4acdbd8b3aace322 100644 (file)
--- 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)