Rename cl_damageeffect_limit to cl_damageeffect_bones, which is more appropriate now

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 69dbea10678f20ff7b836b3d1517e3f7f856dd52..8eba52b71917ee431af73c23a95c8c46c5efde3d 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -323,7 +323,7 @@ set g_teleport_maxspeed 0 "maximum speed that a player can keep when going throu
 
 set cl_damageeffect 1 "enable weapon damage effects. 1 enables the effect on skeletal models, 2 on all objects"
 set cl_damageeffect_ticrate 0.1 "particles spawn rate"
-set cl_damageeffect_limit 5 "how many damages to allow on a player at once (objects are limited to one)"
+set cl_damageeffect_bones 5 "how many damages to allow on a rigged mesh at once (non-skeletal objects are limited to one)"
 set cl_damageeffect_distribute 1 "divide particle intensity if multiple damages are present on a player"
 set cl_damageeffect_lifetime 0.1 "how much a damage effect lasts, multiplied by damage amount"
 set cl_damageeffect_lifetime_min 3 "minimum lifetime a damage effect may have"

diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index fd5e8f58844d2c1f8dbba8ee6569e46d628a5850..fae6dd8db5ff90cb59f6f83ee86caeef3c92c559 100644 (file)
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -375,7 +375,7 @@ float autocvar_cl_lerpexcess;
 string autocvar__togglezoom;
 float autocvar_cl_damageeffect;
 float autocvar_cl_damageeffect_ticrate;
-float autocvar_cl_damageeffect_limit;
+float autocvar_cl_damageeffect_bones;
 float autocvar_cl_damageeffect_distribute;
 float autocvar_cl_damageeffect_lifetime;
 float autocvar_cl_damageeffect_lifetime_min;

diff --git a/qcsrc/client/damage.qc b/qcsrc/client/damage.qc
index e3254d7f49b0294971391b62db9726a9d14c64c5..8faa255a33314975f1afb0d54628d133ca039ddb 100644 (file)
--- a/qcsrc/client/damage.qc
+++ b/qcsrc/client/damage.qc
@@ -310,7 +310,7 @@ void DamageEffect(vector hitorg, float dmg, float type, float specnum)
        // return if we reached our damage effect limit or damages are disabled
        if(skeletal)
        {
-               if(autocvar_cl_damageeffect < 1 || self.total_damages >= autocvar_cl_damageeffect_limit)
+               if(autocvar_cl_damageeffect < 1 || self.total_damages >= autocvar_cl_damageeffect_bones)
                        return; // allow multiple damages on skeletal models
        }
        else