Merge remote branch 'origin/fruitiex/fullbrightskin'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / g_violence.qc

diff --git a/qcsrc/server/g_violence.qc b/qcsrc/server/g_violence.qc
index 8cecaeae689eb574dc43702f7ee6f97109dfd093..f5def6a7dd68e4dd9660d62f4a1d7811372509bc 100644 (file)
--- a/qcsrc/server/g_violence.qc
+++ b/qcsrc/server/g_violence.qc
@@ -13,14 +13,15 @@ float Violence_GibSplash_SendEntity(entity to, float sf)
 // TODO maybe convert this to a TE?
 void Violence_GibSplash_At(vector org, vector dir, float type, float amount, entity gibowner, entity attacker)
 {
+       if(g_cts) // no gibs in CTS
+               return;
+
        entity e;
 
        e = spawn();
        e.classname = "gibsplash";
        e.cnt = amount;
        e.state = type; // should stay smaller than 15
-       if(sv_gentle)
-               e.state |= 0x80; // "force gentle" bit
        if(!sound_allowed(MSG_BROADCAST, gibowner) || !sound_allowed(MSG_BROADCAST, attacker))
                e.state |= 0x40; // "silence" bit
        e.state |= 8 * self.species; // gib type, ranges from 0 to 15