Fix consumable health giving one health unit more than it should

[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 9b26c49053f7410aff10121ce544780ff009365c..0dfec051bf7948b28cf4d9b76889baa0194399b4 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,6 +586,13 @@ 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
@@ -616,7 +628,7 @@ void PutObserverInServer (void)
        self.health = -666;\r
        self.takedamage = DAMAGE_NO;\r
        self.solid = SOLID_NOT;\r
-       self.movetype = MOVETYPE_NOCLIP;\r
+       self.movetype = MOVETYPE_FLY_WORLDONLY; // user preference is controlled by playerprethink\r
        self.flags = FL_CLIENT | FL_NOTARGET;\r
        self.armorvalue = 666;\r
        self.effects = 0;\r
@@ -645,9 +657,9 @@ void PutObserverInServer (void)
        self.fixangle = TRUE;\r
        self.crouch = FALSE;\r
 \r
-       self.view_ofs = PL_VIEW_OFS;\r
+       self.view_ofs = '0 0 0'; // so that your view doesn't go into the ceiling with MOVETYPE_FLY_WORLDONLY, previously "PL_VIEW_OFS"\r
        setorigin (self, spot.origin);\r
-       setsize (self, '0 0 0', '0 0 0');\r
+       setsize (self, PL_CROUCH_MIN, PL_CROUCH_MAX); // give the spectator some space between walls for MOVETYPE_FLY_WORLDONLY\r
        self.prevorigin = self.origin;\r
        self.items = 0;\r
        self.weapons = 0;\r
@@ -855,11 +867,7 @@ void PutClientInServer (void)
                {\r
                        // remove consumable items when we respawn\r
                        if(e.predator == self)\r
-                       {\r
-                               e.nextthink = 0;\r
-                               remove(e);\r
-                               e = world;\r
-                       }\r
+                               Item_Consumable_Remove(e, FALSE);\r
                }\r
 \r
                self.classname = "player";\r
@@ -1630,6 +1638,13 @@ 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
@@ -2357,7 +2372,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
@@ -2380,17 +2395,20 @@ void SetPlayerSize()
 \r
 void ObserverThink()\r
 {\r
+       float prefered_movetype;\r
        if (self.flags & FL_JUMPRELEASED) {\r
                if (self.BUTTON_JUMP && !self.version_mismatch) {\r
-                       self.welcomemessage_time = 0;\r
                        self.flags &~= FL_JUMPRELEASED;\r
                        self.flags |= FL_SPAWNING;\r
                } else if(self.BUTTON_ATCK && !self.version_mismatch) {\r
-                       self.welcomemessage_time = 0;\r
                        self.flags &~= FL_JUMPRELEASED;\r
                        if(SpectateNext() == 1) {\r
                                self.classname = "spectator";\r
                        }\r
+               } else {\r
+                       prefered_movetype = ((!self.BUTTON_USE ? self.cvar_cl_clippedspectating : !self.cvar_cl_clippedspectating) ? MOVETYPE_FLY_WORLDONLY : MOVETYPE_NOCLIP);\r
+                       if (self.movetype != prefered_movetype)\r
+                               self.movetype = prefered_movetype;\r
                }\r
        } else {\r
                if (!(self.BUTTON_ATCK || self.BUTTON_JUMP)) {\r
@@ -2403,6 +2421,7 @@ void ObserverThink()
                        }\r
                }\r
        }\r
+\r
        PrintWelcomeMessage(self);\r
 }\r
 \r
@@ -2603,7 +2622,7 @@ void PlayerPreThink (void)
                        accel_y = bound(-cvar("g_leanplayer_acceleration_max"), accel_y, cvar("g_leanplayer_acceleration_max"));\r
                        accel_z = bound(-cvar("g_leanplayer_acceleration_max"), accel_z, cvar("g_leanplayer_acceleration_max"));\r
 \r
-                       L0_x = vlen(accel);\r
+                       L0_x = vlen(accel) * -1;\r
                        L0_y = L1_y = vectoyaw(accel);\r
 \r
                        L0 = AnglesTransform_FromAngles(L0);\r