Player size now influences a player's weight as well, alongside stomach load. Macros...

[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 23ad32412ddb3fb536d10e5c3d3c12b991fa67dd..dcc68204f2ce0c76a1b983973f489ed587808521 100644 (file)
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -541,7 +541,13 @@ float Client_customizeentityforclient()
        }\r
 \r
        Client_setmodel(setmodel_state());\r
-       self.effects &~= EF_NODEPTHTEST;\r
+       if(cvar("g_nodepthtestplayers"))\r
+               self.effects |= EF_NODEPTHTEST;\r
+       else\r
+               self.effects &~= EF_NODEPTHTEST;\r
+       if(cvar("g_fullbrightplayers"))\r
+               self.effects |= EF_FULLBRIGHT;\r
+\r
        if not(self.stat_eaten)\r
        {\r
                self.alpha = default_player_alpha;\r
@@ -585,7 +591,7 @@ void PutObserverInServer (void)
                WriteEntity(MSG_ONE, self);\r
        }\r
 \r
-       Vore_Disconnect();\r
+       Vore_Disconnect(TRUE);\r
 \r
        kh_Key_DropAll(self, TRUE);\r
 \r
@@ -854,7 +860,7 @@ void PutClientInServer (void)
 \r
                RemoveGrabber(self); // Wazat's Grabber\r
 \r
-               Vore_Disconnect();\r
+               Vore_Disconnect(TRUE);\r
                self.swallow_progress_pred = self.swallow_progress_prey = 0;\r
 \r
                self.classname = "player";\r
@@ -1380,6 +1386,7 @@ void FixClientCvars(entity e)
        stuffcmd(e, strcat("cl_movement_maxairspeed ", ftos(cvar("sv_maxairspeed")), "\n"));\r
        stuffcmd(e, strcat("cl_movement_stopspeed ", ftos(cvar("sv_stopspeed")), "\n"));\r
        stuffcmd(e, strcat("cl_movement_jumpvelocity ", ftos(cvar("sv_jumpvelocity")), "\n"));\r
+       stuffcmd(e, strcat("cl_movement_crouchvelocity ", ftos(cvar("sv_crouchvelocity")), "\n"));\r
        stuffcmd(e, strcat("cl_movement_stepheight ", ftos(cvar("sv_stepheight")), "\n"));\r
        stuffcmd(e, strcat("set cl_movement_friction_on_land ", ftos(cvar("sv_friction_on_land")), "\n"));\r
        stuffcmd(e, strcat("set cl_movement_airaccel_qw ", ftos(cvar("sv_airaccel_qw")), "\n"));\r
@@ -1624,7 +1631,7 @@ void ClientDisconnect (void)
                return;\r
        }\r
 \r
-       Vore_Disconnect();\r
+       Vore_Disconnect(TRUE);\r
 \r
        CheatShutdownClient();\r
 \r
@@ -1895,12 +1902,6 @@ void player_powerups (void)
                }\r
        }\r
 \r
-       if(cvar("g_nodepthtestplayers"))\r
-               self.effects = self.effects | EF_NODEPTHTEST;\r
-\r
-       if(cvar("g_fullbrightplayers"))\r
-               self.effects = self.effects | EF_FULLBRIGHT;\r
-\r
        // midair gamemode: damage only while in the air\r
        // if in midair mode, being on ground grants temporary invulnerability\r
        // (this is so that multishot weapon don't clear the ground flag on the\r
@@ -1960,7 +1961,7 @@ float CalcRotRegen(float current, float regenstable, float regenfactor, float re
                                {\r
                                        msg_entity = self;\r
                                        if(clienttype(msg_entity) == CLIENTTYPE_REAL)\r
-                                               soundto(MSG_ONE, self, CHAN_AUTO, regensound, VOL_BASE, ATTN_NONE);\r
+                                               soundto(MSG_ONE, self, CHAN_AUTO, regensound, VOL_BASE, ATTN_NONE, 0);\r
                                }\r
                                self.regen_soundtime = time + 1; // only replay the sound if regen was paused for one second\r
                        }\r
@@ -2128,7 +2129,7 @@ void SpectateCopy(entity spectatee) {
        self.swallow_progress_prey = spectatee.swallow_progress_prey;\r
        self.swallow_progress_pred = spectatee.swallow_progress_pred;\r
        self.stat_stomachload = spectatee.stat_stomachload;\r
-       self.stat_stomachmaxload = spectatee.stomach_maxload;\r
+       self.stat_stomachmaxload = spectatee.stat_stomachmaxload;\r
        self.stat_digesting = spectatee.stat_digesting;\r
        self.stat_canleave = spectatee.stat_canleave;\r
        self.stat_canswallow = spectatee.stat_canswallow;\r
@@ -2140,6 +2141,9 @@ void SpectateCopy(entity spectatee) {
        setsize(self, spectatee.mins, spectatee.maxs);\r
        SetZoomState(spectatee.zoomstate);\r
 \r
+       // copy necessary flags\r
+       if(spectatee.flags & FL_ONGROUND)       self.flags |= FL_ONGROUND;      else    self.flags &~= FL_ONGROUND;\r
+\r
        anticheat_spectatecopy(spectatee);\r
 }\r
 \r