Merge remote branch 'origin/fruitiex/ctsfix'

diff --combined defaultXonotic.cfg
index 7026fc46b41e5410b462cff70b23555057752577,51eff15108e60aee0c3ff741ee23e46ac138d67f..e273cac46741f076095ee9d45df988dddcb03bd0
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -596,40 -596,56 +596,56 @@@ set g_respawn_waves 0 "respawn in wave
  // to force disable delay or waves, set them to 0.125
  set g_ctf_respawn_delay 0
  set g_ctf_respawn_waves 0
+ set g_ctf_weapon_stay 1
  set g_dm_respawn_delay 0
  set g_dm_respawn_waves 0
+ set g_dm_weapon_stay 0
  set g_dom_respawn_delay 0
  set g_dom_respawn_waves 0
+ set g_dom_weapon_stay 0
  set g_lms_respawn_delay 0
  set g_lms_respawn_waves 0
+ set g_lms_weapon_stay 0
  set g_rune_respawn_delay 0
  set g_rune_respawn_waves 0
+ set g_rune_weapon_stay 0
  set g_tdm_respawn_delay 0
  set g_tdm_respawn_waves 0
+ set g_tdm_weapon_stay 0
  set g_kh_respawn_delay 0
  set g_kh_respawn_waves 0
+ set g_kh_weapon_stay 0
  set g_arena_respawn_delay 0
  set g_arena_respawn_waves 0
+ set g_arena_weapon_stay 0
  set g_ca_respawn_delay 0
  set g_ca_respawn_waves 0
+ set g_ca_weapon_stay 0
  set g_ca_damage2score_multiplier 0.01
  set g_ca_round_timelimit 180
  set g_nexball_respawn_delay 0
  set g_nexball_respawn_waves 0
+ set g_nexball_weapon_stay 0
  set g_as_respawn_delay 0
  set g_as_respawn_waves 0
+ set g_as_weapon_stay 1
  set g_ons_respawn_delay 0
  set g_ons_respawn_waves 0
+ set g_ons_weapon_stay 0
  set g_rc_respawn_waves 0
  set g_rc_respawn_delay 0
+ set g_rc_weapon_stay 0
  set g_cts_respawn_waves 0
- set g_cts_respawn_delay 0.25
+ set g_cts_respawn_delay 0
  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"
+ set g_cts_weapon_stay 1
  set g_freezetag_respawn_waves 0
- set g_freezetag_respawn_delay 0.25
+ set g_freezetag_respawn_delay 0
+ set g_freezetag_weapon_stay 1
  set g_ka_respawn_delay 0
  set g_ka_respawn_waves 0
+ set g_ka_weapon_stay 0
  
  // overtime
  seta timelimit_overtime 2 "duration in minutes of one added overtime, added to the timelimit"
@@@ -2065,11 -2081,6 +2081,11 @@@ set g_playerstats_uri "
  // create this cvar in case the engine did not
  set snd_soundradius 1200
  
 +// loading screen
 +scr_loadingscreen_scale 1
 +scr_loadingscreen_scale_base 1
 +scr_loadingscreen_scale_limit 1
 +
  // other config files
  exec balanceXonotic.cfg
  exec ctfscoring-ai.cfg

diff --combined qcsrc/server/cl_client.qc
index 2b8dc1881c77a9fca7d4dce51fda57ebbb6d2f8a,707d36ededa4565e79c4f62a05565fb73443432a..475771fd3a23e86c174b5a2592a0122b0babe8f8
--- 1/qcsrc/server/cl_client.qc
--- 2/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -1244,16 -1244,18 +1244,16 @@@ void ClientKill_Now_TeamChange(
  
  void ClientKill_Now()
  {
 +      remove(self.killindicator);
 +      self.killindicator = world;
 +
        if(self.killindicator_teamchange)
                ClientKill_Now_TeamChange();
  
        // in any case:
        Damage(self, self, self, 100000, DEATH_KILL, self.origin, '0 0 0');
  
 -      if(self.killindicator)
 -      {
 -              dprint("Cleaned up after a leaked kill indicator.\n");
 -              remove(self.killindicator);
 -              self.killindicator = world;
 -      }
 +      // now I am sure the player IS dead
  }
  void KillIndicator_Think()
  {
@@@ -1270,6 -1272,11 +1270,11 @@@
                ClientKill_Now(); // no oldself needed
                return;
        }
+     else if(g_cts && self.health == 1) // health == 1 means that it's silent
+     {
+         self.nextthink = time + 1;
+         self.cnt -= 1;
+     }
        else
        {
                if(self.cnt <= 10)
@@@ -1301,12 -1308,21 +1306,21 @@@ void ClientKill_TeamChange (float targe
        entity e;
        killtime = autocvar_g_balance_kill_delay;
  
-       if(g_race_qualifying)
+       if(g_race_qualifying || g_cts)
                killtime = 0;
  
+     if(g_cts && self.killindicator && self.killindicator.health == 1) // self.killindicator.health == 1 means that the kill indicator was spawned by CTS_ClientKill
+     {
+               remove(self.killindicator);
+               self.killindicator = world;
+ 
+         ClientKill_Now(); // allow instant kill in this case
+         return;
+     }
+ 
        self.killindicator_teamchange = targetteam;
  
-       if(!self.killindicator)
+     if(!self.killindicator)
        {
                if(self.modelindex && self.deadflag == DEAD_NO)
                {
@@@ -1374,20 -1390,15 +1388,15 @@@ void ClientKill (void
                ClientKill_TeamChange(0);
  }
  
- void CTS_ClientKill_Think (void)
+ void CTS_ClientKill (entity e) // silent version of ClientKill, used when player finishes a CTS run. Useful to prevent cheating by running back to the start line and starting out with more speed
  {
-       self = self.owner; // set self to the player to be killed
-       sprint(self, "^1You were killed in order to prevent cheating!");
-       ClientKill_Now();
- }
- 
- void CTS_ClientKill (float t) // silent version of ClientKill
- {
-       entity e;
-       e = spawn();
-       e.owner = self;
-       e.think = CTS_ClientKill_Think;
-       e.nextthink = t;
+     e.killindicator = spawn();
+     e.killindicator.owner = e;
+     e.killindicator.think = KillIndicator_Think;
+     e.killindicator.nextthink = time + (e.lip) * 0.05;
+     e.killindicator.cnt = ceil(autocvar_g_cts_finish_kill_delay);
+     e.killindicator.health = 1; // this is used to indicate that it should be silent
+     e.lip = 0;
  }
  
  void DoTeamChange(float destteam)
@@@ -2737,7 -2748,7 +2746,7 @@@ void PlayerPreThink (void
                                if(frametime)
                                        player_anim();
                                button_pressed = (self.BUTTON_ATCK || self.BUTTON_JUMP || self.BUTTON_ATCK2 || self.BUTTON_HOOK || self.BUTTON_USE);
-                               force_respawn = (g_lms || (g_ca) || autocvar_g_forced_respawn);
+                               force_respawn = (g_lms || g_ca || g_cts || autocvar_g_forced_respawn);
                                if (self.deadflag == DEAD_DYING)
                                {
                                        if(force_respawn)