X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_player.qc;h=db8bc4bfc94ec7b8bda49b0a2146bc58576348eb;hb=d561f76342a7e8060a5a1aae4bab3f2bf56c17aa;hp=ee6d11dfd455d2e8969e8b9a47975a766cb2d7f2;hpb=fef280899c7d1bb27078da823b0a64843b2f1129;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index ee6d11dfd4..db8bc4bfc9 100644
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -111,6 +111,7 @@ void CopyBody(float keepvelocity)
 	self.enemy = oldself;
 	self.lip = oldself.lip;
 	self.colormap = oldself.colormap;
+	self.glowmod = oldself.glowmod;
 	self.iscreature = oldself.iscreature;
 	self.angles = oldself.angles;
 	self.avelocity = oldself.avelocity;
@@ -142,6 +143,7 @@ void CopyBody(float keepvelocity)
 	self.movetype = oldself.movetype;
 	self.nextthink = oldself.nextthink;
 	self.solid = oldself.solid;
+	self.ballistics_density = oldself.ballistics_density;
 	self.takedamage = oldself.takedamage;
 	self.think = oldself.think;
 	self.customizeentityforclient = oldself.customizeentityforclient;
@@ -165,14 +167,13 @@ void CopyBody(float keepvelocity)
 
 float player_getspecies()
 {
+	float s;
 	get_model_parameters(self.playermodel, self.skinindex);
-	if(get_model_parameters_species >= 0)
-	{
-		get_model_parameters(string_null, 0);
-		return get_model_parameters_species;
-	}
+	s = get_model_parameters_species;
 	get_model_parameters(string_null, 0);
-	return SPECIES_HUMAN;
+	if(s < 0)
+		return SPECIES_HUMAN;
+	return s;
 }
 
 void player_setupanimsformodel()
@@ -433,7 +434,7 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
 	else
 		Violence_GibSplash_At(hitloc, force, 2, bound(0, damage, 200) / 16, self, attacker);
 
-	if((g_arena && numspawned < 2) || (g_ca && player_cnt < 2) && !inWarmupStage)
+	if((g_arena && numspawned < 2) || (g_ca && ca_players < required_ca_players) && !inWarmupStage)
 		return;
 
 	if (!g_minstagib)
@@ -622,6 +623,7 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
 		self.movetype = MOVETYPE_TOSS;
 		// shootable corpse
 		self.solid = SOLID_CORPSE;
+		self.ballistics_density = cvar("g_ballistics_density_corpse");
 		// don't stick to the floor
 		self.flags &~= FL_ONGROUND;
 		// dying animation
@@ -658,7 +660,7 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
 		// call the corpse damage function just in case it wants to gib
 		self.event_damage(inflictor, attacker, 0, deathtype, hitloc, force);
 		// set up to fade out later
-		SUB_SetFade (self, time + 12 + random () * 4, 1);
+		SUB_SetFade (self, time + 6 + random (), 1);
 
 		// remove laserdot
 		if(self.weaponentity)
@@ -1202,7 +1204,10 @@ void LoadPlayerSounds(string f, float first)
 	var .string field;
 	fh = fopen(f, FILE_READ);
 	if(fh < 0)
+	{
+		dprint("Player sound file not found: ", f, "\n");
 		return;
+	}
 	while((s = fgets(fh)))
 	{
 		if(tokenize_console(s) != 3)