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 393463ccff1fd88f0a874e39b6504941eccbf43c..9035c5861635c0c8cd9dbb05351a4049184eaaa9 100644 (file)
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -831,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
@@ -1010,9 +1013,11 @@ 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
        return TRUE;\r
 }\r