X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fplayer.qc;h=fa2cd48dafced1a2935793965dcb51e08c049ecc;hb=fbd313c7ceb26a09310d8062926f4ac2468623a8;hp=88acd12f979522b3849813ac39064d3972222664;hpb=6e4c0c69ce16c05cdc8ce97c5287c848acfc3b1f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/player.qc b/qcsrc/server/player.qc
index 88acd12f9..fa2cd48da 100644
--- a/qcsrc/server/player.qc
+++ b/qcsrc/server/player.qc
@@ -16,7 +16,7 @@
 #include "../common/animdecide.qh"
 #include "../common/csqcmodel_settings.qh"
 #include "../common/deathtypes/all.qh"
-#include "../common/triggers/subs.qh"
+#include "../common/mapobjects/subs.qh"
 #include "../common/playerstats.qh"
 #include "../lib/csqcmodel/sv_model.qh"
 
@@ -25,7 +25,7 @@
 #include "../common/physics/player.qh"
 #include "../common/effects/qc/_mod.qh"
 #include "../common/mutators/mutator/waypoints/waypointsprites.qh"
-#include "../common/triggers/include.qh"
+#include "../common/mapobjects/include.qh"
 #include "../common/wepent.qh"
 
 #include "weapons/weaponstats.qh"
@@ -220,7 +220,7 @@ void PlayerCorpseDamage(entity this, entity inflictor, entity attacker, float da
 
 void calculate_player_respawn_time(entity this)
 {
-	if(g_ca)
+	if(MUTATOR_CALLHOOK(CalculateRespawnTime, this))
 		return;
 
 	float gametype_setting_tmp;
@@ -627,15 +627,6 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage,
 		else
 			animdecide_setstate(this, this.anim_state | ANIMSTATE_DEAD2, true);
 
-		/* // postpone resize until frame end so that dead player can still
-		// properly get hit by all the projectiles fired in this frame (shotgun)
-		if (this.maxs.z > 5)
-		{
-			this.maxs_z = 5;
-			setsize(this, this.mins, this.maxs);
-		}
-		*/
-
 		// set damage function to corpse damage
 		this.event_damage = PlayerCorpseDamage;
 		// call the corpse damage function just in case it wants to gib
@@ -978,7 +969,7 @@ int Say(entity source, int teamsay, entity privatesay, string msgin, bool floodc
 	if (privatesay && source && !IS_PLAYER(source))
 	{
 		if (!game_stopped)
-		if ((privatesay && !IS_PLAYER(privatesay)) || (autocvar_g_chat_nospectators == 1) || (autocvar_g_chat_nospectators == 2 && !warmup_stage))
+		if ((privatesay && IS_PLAYER(privatesay)) && ((autocvar_g_chat_nospectators == 1) || (autocvar_g_chat_nospectators == 2 && !warmup_stage)))
 			ret = -1; // just hide the message completely
 	}