Cvar and fix crouch speed

[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 09172abe248709dae0e106a2dbe4dc0bba78f140..3b4afbc550cecae97cca0c537d319c4cc66b8e3f 100644 (file)
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -543,7 +543,12 @@ float Client_customizeentityforclient()
        Client_setmodel(setmodel_state());\r
        self.effects &~= EF_NODEPTHTEST;\r
        if not(self.stat_eaten)\r
+       {\r
                self.alpha = default_player_alpha;\r
+               if(cvar("g_vore_swallowfade"))\r
+               if not(other == self && !chase)\r
+                       self.alpha *= 1 - self.swallow_progress_prey; // fade players out as they are swallowed, to better simulate their disappearing\r
+       }\r
        else if(cvar("g_vore_neighborprey_distance") && self.predator == other.predator && !(chase || other.classname == "observer"))\r
        {\r
                self.alpha = default_player_alpha; // allow seeing neighboring prey\r
@@ -581,13 +586,6 @@ void PutObserverInServer (void)
        }\r
 \r
        Vore_Disconnect();\r
-       entity e;\r
-       for(e = world; (e = find(e, classname, "consumable")); )\r
-       {\r
-               // remove consumable items when we spectate\r
-               if(e.predator == self)\r
-                       Item_Consumable_Remove(e, TRUE);\r
-       }\r
 \r
        kh_Key_DropAll(self, TRUE);\r
 \r
@@ -858,12 +856,6 @@ void PutClientInServer (void)
 \r
                Vore_Disconnect();\r
                self.swallow_progress_pred = self.swallow_progress_prey = 0;\r
-               for(e = world; (e = find(e, classname, "consumable")); )\r
-               {\r
-                       // remove consumable items when we respawn\r
-                       if(e.predator == self)\r
-                               Item_Consumable_Remove(e, FALSE);\r
-               }\r
 \r
                self.classname = "player";\r
                self.wasplayer = TRUE;\r
@@ -1388,6 +1380,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
@@ -1633,13 +1626,6 @@ void ClientDisconnect (void)
        }\r
 \r
        Vore_Disconnect();\r
-       entity e;\r
-       for(e = world; (e = find(e, classname, "consumable")); )\r
-       {\r
-               // remove consumable items when we disconnect\r
-               if(e.predator == self)\r
-                       Item_Consumable_Remove(e, TRUE);\r
-       }\r
 \r
        CheatShutdownClient();\r
 \r
@@ -2367,7 +2353,7 @@ void SetPlayerSize()
                {\r
                        //setsize (self, PL_MIN * self.scale, PL_MAX * self.scale);\r
                        if(!self.stat_eaten)\r
-                               self.view_ofs = PL_VIEW_OFS * self.scale;\r
+                               self.view_ofs = PL_VIEW_OFS * pow(self.scale, cvar("g_healthsize_viewfactor"));\r
                }\r
 \r
                self.last_alive_scale = self.scale;\r
@@ -2478,8 +2464,6 @@ void() ctf_setstatus;
 .float power_sounded;\r
 void PlayerPreThink (void)\r
 {\r
-       portrait(self); // TEMPORARY TEST\r
-\r
        self.stat_game_starttime = game_starttime;\r
        self.stat_allow_oldnexbeam = cvar("g_allow_oldnexbeam");\r
        self.stat_leadlimit = cvar("leadlimit");\r