Use fakepredator in more important cases
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 27 Feb 2011 16:17:49 +0000 (18:17 +0200)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 27 Feb 2011 16:17:49 +0000 (18:17 +0200)
data/qcsrc/server/cl_client.qc
data/qcsrc/server/cl_physics.qc

index 3ec0cdd..47f2749 100644 (file)
@@ -1603,7 +1603,7 @@ void ChatBubbleThink()
                remove(self);\r
                return;\r
        }\r
-       if ((self.owner.BUTTON_CHAT && !self.owner.deadflag && self.owner.predator.classname != "player")\r
+       if ((self.owner.BUTTON_CHAT && !self.owner.deadflag && self.owner.predator.classname != "player" && self.owner.fakepredator.classname != "player")\r
 #ifdef TETRIS\r
                || self.owner.tetris_on\r
 #endif\r
@@ -1646,7 +1646,7 @@ void TeamBubbleThink()
                return;\r
        }\r
 //     setorigin(self, self.owner.origin + '0 0 15' + self.owner.maxs_z * '0 0 1');  // bandwidth hog. setattachment does this now\r
-       if (self.owner.BUTTON_CHAT || self.owner.deadflag || self.owner.killindicator || self.owner.predator.classname == "player")\r
+       if (self.owner.BUTTON_CHAT || self.owner.deadflag || self.owner.killindicator || self.owner.predator.classname == "player" || self.owner.fakepredator.classname == "player")\r
                self.model = "";\r
        else\r
        {\r
index 9cd1165..bd04e84 100644 (file)
@@ -697,7 +697,7 @@ void SV_PlayerPhysics()
                }\r
        }\r
 \r
-       if(self.predator.classname == "player")\r
+       if(self.predator.classname == "player" || self.fakepredator.classname == "player")\r
                return;\r
 \r
        if (self.movetype == MOVETYPE_NONE)\r