Allow fall damage in situations where it should be allowed

[voretournament/voretournament.git] / data / qcsrc / server / cl_client.qc

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index 74ab85b188ce39b2cfdfe543d4de1de8b83e23eb..9035c5861635c0c8cd9dbb05351a4049184eaaa9 100644 (file)
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -13,10 +13,13 @@ void Announce(string snd) {
 }\r
 \r
 void AnnounceTo(entity e, string snd) {\r
-       msg_entity = e;\r
-       WriteByte(MSG_ONE, SVC_TEMPENTITY);\r
-       WriteByte(MSG_ONE, TE_CSQC_ANNOUNCE);\r
-       WriteString(MSG_ONE, snd);\r
+       if (clienttype(e) == CLIENTTYPE_REAL)\r
+       {\r
+               msg_entity = e;\r
+               WriteByte(MSG_ONE, SVC_TEMPENTITY);\r
+               WriteByte(MSG_ONE, TE_CSQC_ANNOUNCE);\r
+               WriteString(MSG_ONE, snd);\r
+       }\r
 }\r
 \r
 float ClientData_Send(entity to, float sf)\r
@@ -828,7 +831,10 @@ void PutClientInServer (void)
                self.wasplayer = TRUE;\r
                self.iscreature = TRUE;\r
                self.movetype = MOVETYPE_WALK;\r
-               self.solid = SOLID_SLIDEBOX;\r
+               if(cvar("g_player_colisions"))\r
+                       self.solid = SOLID_SLIDEBOX;\r
+               else\r
+                       self.solid = SOLID_CORPSE;\r
                if(cvar("g_playerclip_collisions"))\r
                        self.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_PLAYERCLIP;\r
                else\r
@@ -1007,11 +1013,12 @@ float ClientInit_SendEntity(entity to, float sf)
                WriteString(MSG_ENTITY, world.fog);\r
        else\r
                WriteString(MSG_ENTITY, "");\r
+       WriteCoord(MSG_ENTITY, cvar("g_campaign"));\r
        WriteByte(MSG_ENTITY, cvar("g_balance_armor_blockpercent") * 255.0);\r
        WriteByte(MSG_ENTITY, cvar("g_balance_weaponswitchdelay") * 255.0);\r
 \r
+       WriteCoord(MSG_ENTITY, cvar("g_vore"));\r
        WriteCoord(MSG_ENTITY, cvar("g_balance_vore_swallow_limit"));\r
-       WriteCoord(MSG_ENTITY, cvar("g_vore_showpreyhealth"));\r
        return TRUE;\r
 }\r
 \r
@@ -1637,7 +1644,8 @@ void TeamBubbleThink()
                self.model = "";\r
        else\r
        {\r
-               if(cvar("g_balance_vore_teamheal") && self.owner.health < cvar("g_balance_vore_teamheal_stable"))\r
+               if(cvar("g_balance_vore_teamheal") && cvar("g_vore_teamvore"))\r
+               if(self.owner.health < cvar("g_balance_vore_teamheal_stable"))\r
                        setmodel(self, "models/misc/teambubbleheal.spr"); // indicate that this player can be teamhealed\r
                else\r
                        setmodel(self, "models/misc/teambubble.spr");\r