X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_player.qc;h=60df5dd314a21d7008cd1232731a006dadffada3;hp=cb44da03fe794cada0243885dd44b53f0a974860;hb=d0db4b5db11800d291fbdba93a67e8487fa033e2;hpb=d5bffe0a0226860335a3293f67ee43a09f8aad0a

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index cb44da03f..60df5dd31 100644
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -338,7 +338,6 @@ void PlayerCorpseDamage (entity inflictor, entity attacker, float damage, float
 }
 
 void ClientKill_Now_TeamChange();
-void freezetag_CheckWinner();
 
 void PlayerDamage (entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
 {
@@ -347,9 +346,6 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
 	float valid_damage_for_weaponstats;
 	float excess;
 
-	if((g_arena && numspawned < 2) || (g_ca && allowed_to_spawn) && !inWarmupStage)
-		return;
-
 	dh = max(self.health, 0);
 	da = max(self.armorvalue, 0);
 
@@ -579,18 +575,9 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
 			}
 		}
 
-		if(!g_freezetag)
-		{
-			// become fully visible
-			self.alpha = default_player_alpha;
-			// throw a weapon
-			SpawnThrownWeapon (self.origin + (self.mins + self.maxs) * 0.5, self.switchweapon);
-		}
-
 		// print an obituary message
 		Obituary (attacker, inflictor, self, deathtype);
 		race_PreDie();
-		DropAllRunes(self);
 
         // increment frag counter for used weapon type
         float w;
@@ -599,18 +586,12 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
 	if(accuracy_isgooddamage(attacker, self))
         attacker.accuracy.(accuracy_frags[w-1]) += 1;
 
-		if(deathtype == DEATH_HURTTRIGGER && g_freezetag)
-		{
-			PutClientInServer();
-			count_alive_players(); // re-count players
-			freezetag_CheckWinner();
-			return;
-		}
-
 		frag_attacker = attacker;
 		frag_inflictor = inflictor;
 		frag_target = self;
+		frag_deathtype = deathtype;
 		MUTATOR_CALLHOOK(PlayerDies);
+
 		weapon_action(self.weapon, WR_PLAYERDEATH);
 
 		RemoveGrapplingHook(self);
@@ -619,7 +600,6 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
 
 		if(clienttype(self) == CLIENTTYPE_REAL)
 		{
-			stuffcmd(self, "-zoom\n");
 			self.fixangle = TRUE;
 			//msg_entity = self;
 			//WriteByte (MSG_ONE, SVC_SETANGLE);
@@ -628,19 +608,23 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
 			//WriteAngle (MSG_ONE, 80);
 		}
 
-		if(defer_ClientKill_Now_TeamChange) // TODO does this work with FreezeTag?
-			ClientKill_Now_TeamChange();
-
-		if(g_arena)
-			Spawnqueue_Unmark(self);
+		if(defer_ClientKill_Now_TeamChange)
+			ClientKill_Now_TeamChange(); // can turn player into spectator
 
-		if(g_freezetag)
+		// player could have been miraculously resuscitated ;)
+		// e.g. players in freezetag get frozen, they don't really die
+		if(self.health >= 1 || self.classname != "player")
 			return;
 
 		// when we get here, player actually dies
-		// clear waypoints (do this AFTER FreezeTag)
+
+		// clear waypoints
 		WaypointSprite_PlayerDead();
+		// throw a weapon
+		SpawnThrownWeapon (self.origin + (self.mins + self.maxs) * 0.5, self.switchweapon);
 
+		// become fully visible
+		self.alpha = default_player_alpha;
 		// make the corpse upright (not tilted)
 		self.angles_x = 0;
 		self.angles_z = 0;
@@ -679,6 +663,10 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
 			self.respawn_countdown = 10; // first number to count down from is 10
 		else
 			self.respawn_countdown = -1; // do not count down
+
+		if(g_cts || autocvar_g_forced_respawn)
+			self.respawn_flags = self.respawn_flags | RESPAWN_FORCE;
+
 		self.death_time = time;
 		if (random() < 0.5)
 			animdecide_setstate(self, self.anim_state | ANIMSTATE_DEAD1, TRUE);