Merge remote branch 'origin/morphed/flag'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / gibs.qc

diff --git a/qcsrc/client/gibs.qc b/qcsrc/client/gibs.qc
index 78826f8f34925e63b7e38954d0ea623f2773ee8b..6f6e143934e39897f721d562d9a7a2dc4e77fe3e 100644 (file)
--- a/qcsrc/client/gibs.qc
+++ b/qcsrc/client/gibs.qc
@@ -153,14 +153,15 @@ void Ent_GibSplash(float isNew)
        org_z = ReadShort() * 4 + 2;
        vel = decompressShortVector(ReadShort());
 
-       if(cvar("cl_gentle_gibs") || cvar("cl_gentle"))
+       float cl_gentle_gibs = cvar("cl_gentle_gibs");
+       if(cl_gentle_gibs || cvar("cl_gentle"))
                type |= 0x80; // set gentle bit
 
        if(type & 0x80)
        {
-               if(cvar("cl_gentle_gibs") == 2)
+               if(cl_gentle_gibs == 2)
                        gentle_prefix = "";
-               else if(cvar("cl_gentle_gibs") == 3) 
+               else if(cl_gentle_gibs == 3) 
                        gentle_prefix = "happy_";
                else
                        gentle_prefix = "morphed_";
@@ -171,7 +172,7 @@ void Ent_GibSplash(float isNew)
                gentle_prefix = "particlegibs_";
        }
 
-       if not(cvar("cl_gentle_gibs") || cvar("cl_gentle"))
+       if not(cl_gentle_gibs || cvar("cl_gentle"))
                amount *= 1 - cvar("cl_nogibs");
 
        if(cvar("ekg"))