From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 27 Feb 2011 16:17:49 +0000 (+0200)
Subject: Use fakepredator in more important cases
X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=6d61966a10850012aaedcc72c0c90f9136db3bfe

Use fakepredator in more important cases
---

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index 3ec0cddf..47f27497 100644
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -1603,7 +1603,7 @@ void ChatBubbleThink()
 		remove(self);
 		return;
 	}
-	if ((self.owner.BUTTON_CHAT && !self.owner.deadflag && self.owner.predator.classname != "player")
+	if ((self.owner.BUTTON_CHAT && !self.owner.deadflag && self.owner.predator.classname != "player" && self.owner.fakepredator.classname != "player")
 #ifdef TETRIS
 		|| self.owner.tetris_on
 #endif
@@ -1646,7 +1646,7 @@ void TeamBubbleThink()
 		return;
 	}
 //	setorigin(self, self.owner.origin + '0 0 15' + self.owner.maxs_z * '0 0 1');  // bandwidth hog. setattachment does this now
-	if (self.owner.BUTTON_CHAT || self.owner.deadflag || self.owner.killindicator || self.owner.predator.classname == "player")
+	if (self.owner.BUTTON_CHAT || self.owner.deadflag || self.owner.killindicator || self.owner.predator.classname == "player" || self.owner.fakepredator.classname == "player")
 		self.model = "";
 	else
 	{
diff --git a/data/qcsrc/server/cl_physics.qc b/data/qcsrc/server/cl_physics.qc
index 9cd11650..bd04e84b 100644
--- a/data/qcsrc/server/cl_physics.qc
+++ b/data/qcsrc/server/cl_physics.qc
@@ -697,7 +697,7 @@ void SV_PlayerPhysics()
 		}
 	}
 
-	if(self.predator.classname == "player")
+	if(self.predator.classname == "player" || self.fakepredator.classname == "player")
 		return;
 
 	if (self.movetype == MOVETYPE_NONE)