very fast respawn in CTS, no violence to prevent lagging up clients

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 151b6fbe4e270577642f2666717f9ca7c20fa5ba..e6c7f39bb166cedce305712769e68cf127d7f48b 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -624,7 +624,7 @@ set g_ons_respawn_waves 0
 set g_rc_respawn_waves 0
 set g_rc_respawn_delay 0
 set g_cts_respawn_waves 0
-set g_cts_respawn_delay 0
+set g_cts_respawn_delay 0.25
 set g_cts_selfdamage 1 "0 = disable all selfdamage and falldamage in cts"
 set g_cts_finish_kill_delay 10 "prevent cheating by running back to the start line, and starting out with more speed than otherwise possible"
 

diff --git a/qcsrc/server/g_violence.qc b/qcsrc/server/g_violence.qc
index a6e73ba251b1132e343ab39ffac5bf21a1f81563..f5def6a7dd68e4dd9660d62f4a1d7811372509bc 100644 (file)
--- a/qcsrc/server/g_violence.qc
+++ b/qcsrc/server/g_violence.qc
@@ -13,6 +13,9 @@ 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();