From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 12 Dec 2010 13:43:25 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/ctsfix'
X-Git-Tag: xonotic-v0.1.0preview~51
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=8f1900cecab47b015eeac137dd7f542164862adc;hp=d7045045a68a8e0f187448274e226dea687ef38d

Merge remote branch 'origin/fruitiex/ctsfix'
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 51eff15108..e273cac467 100644
--- 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 2b6e22ce76..589a7fd2d7 100644
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 707d36eded..475771fd3a 100644
--- 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()
 {