Merge remote branch 'origin/fruitiex/ctsfix'

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 51eff15108e60aee0c3ff741ee23e46ac138d67f..e273cac46741f076095ee9d45df988dddcb03bd0 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -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 --git a/gfx/loading.tga b/gfx/loading.tga
index 2b6e22ce76fb1ba1ebfa8009a4cc5abb435f4be1..589a7fd2d7aeeda72dd74416a986adf2deb032d1 100644 (file)
Binary files a/gfx/loading.tga and b/gfx/loading.tga differ

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 707d36ededa4565e79c4f62a05565fb73443432a..475771fd3a23e86c174b5a2592a0122b0babe8f8 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -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()
 {