Merge remote branch 'origin/fruitiex/ctsfix'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 12 Dec 2010 13:43:25 +0000 (14:43 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 12 Dec 2010 13:43:25 +0000 (14:43 +0100)
defaultXonotic.cfg
gfx/loading.tga
qcsrc/server/cl_client.qc

index 51eff15..e273cac 100644 (file)
@@ -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
index 2b6e22c..589a7fd 100644 (file)
Binary files a/gfx/loading.tga and b/gfx/loading.tga differ
index 707d36e..475771f 100644 (file)
@@ -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()
 {