Let's not forget the fake prey

[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 33790477b452624c74341a998a1c1a3e03a5a2f3..69404cb855267f1d807420b5d3d3622b6083b3dc 100644 (file)
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -528,10 +528,12 @@ float Client_customizeentityforclient()
        }\r
 \r
        Client_setmodel(setmodel_state());\r
-       if not(self.predator.classname == "player" || self.fakeprey)\r
+       if not(self.stat_eaten || self.fakeprey)\r
                self.alpha = default_player_alpha;\r
+       else if(cvar("g_vore_neighborprey_distance") && (self.predator == other.predator || self.predator == other.fakepredator) && self != other && !(other.cvar_chase_active || other.classname == "observer"))\r
+               self.alpha = default_player_alpha; // allow seeing neighboring prey\r
        else\r
-               self.alpha = -1; // hide all prey\r
+               self.alpha = -1; // hide prey\r
        return TRUE;\r
 }\r
 \r
@@ -829,7 +831,7 @@ void PutClientInServer (void)
                RemoveGrabber(self); // Wazat's Grabber\r
 \r
                Vore_DeadPrey_Detach(self);\r
-               self.fakeprey = 0; // completely clear the fakeprey status\r
+               self.fakeprey = FALSE; // clear the fakeprey status\r
 \r
                self.classname = "player";\r
                self.wasplayer = TRUE;\r
@@ -1612,7 +1614,7 @@ void ChatBubbleThink()
                remove(self);\r
                return;\r
        }\r
-       if ((self.owner.BUTTON_CHAT && !self.owner.deadflag && self.owner.predator.classname != "player" && self.owner.fakepredator.classname != "player")\r
+       if ((self.owner.BUTTON_CHAT && !self.owner.deadflag && !self.owner.stat_eaten && self.owner.fakepredator.classname != "player")\r
 #ifdef TETRIS\r
                || self.owner.tetris_on\r
 #endif\r
@@ -1655,7 +1657,7 @@ void TeamBubbleThink()
                return;\r
        }\r
 //     setorigin(self, self.owner.origin + '0 0 15' + self.owner.maxs_z * '0 0 1');  // bandwidth hog. setattachment does this now\r
-       if (self.owner.BUTTON_CHAT || self.owner.deadflag || self.owner.killindicator || self.owner.predator.classname == "player" || self.owner.fakepredator.classname == "player")\r
+       if (self.owner.BUTTON_CHAT || self.owner.deadflag || self.owner.killindicator || self.owner.stat_eaten)\r
                self.model = "";\r
        else\r
        {\r
@@ -2080,6 +2082,10 @@ void SpectateCopy(entity spectatee) {
        self.stat_digesting = spectatee.stat_digesting;\r
        self.stat_canleave = spectatee.stat_canleave;\r
        self.stat_canswallow = spectatee.stat_canswallow;\r
+       self.stat_sbring1_type = spectatee.stat_sbring1_type;\r
+       self.stat_sbring1_clip = spectatee.stat_sbring1_clip;\r
+       self.stat_sbring2_type = spectatee.stat_sbring2_type;\r
+       self.stat_sbring2_clip = spectatee.stat_sbring2_clip;\r
        setorigin(self, spectatee.origin);\r
        setsize(self, spectatee.mins, spectatee.maxs);\r
        SetZoomState(spectatee.zoomstate);\r
@@ -2271,30 +2277,36 @@ float vercmp(string v1, string v2)
        return vercmp_recursive(v1, v2);\r
 }\r
 \r
-void ApplyHealthSize()\r
+void SetPlayerSize()\r
 {\r
-       // change player scale based on the amount of health we have\r
-\r
-       if not(cvar("g_healthsize"))\r
-               return;\r
+       if(cvar("g_healthsize"))\r
+       {\r
+               // change player scale based on the amount of health we have\r
 \r
-       self.scale = bound(cvar("g_healthsize_min"), self.health, cvar("g_healthsize_max")) / cvar("g_healthsize");\r
+               self.scale = bound(cvar("g_healthsize_min"), self.health, cvar("g_healthsize_max")) / cvar("g_healthsize");\r
 \r
-       // The following code sets the bounding box to match the player's size.\r
-       // It is currently disabled because of issues with engine movement prediction (cl_movement).\r
-       // The engine expects the bounding box to be default size, and changing it will cause glitches.\r
-       // This code may be enabled once the engine has the ability to use different bbox sizes for movement prediction.\r
-       if(self.crouch)\r
-       {\r
-               //setsize (self, PL_CROUCH_MIN * self.scale, PL_CROUCH_MAX * self.scale);\r
-               if not(self.predator.classname == "player" || self.fakeprey > 1)\r
-                       self.view_ofs = PL_CROUCH_VIEW_OFS * self.scale;\r
+               // The following code sets the bounding box to match the player's size.\r
+               // It is currently disabled because of issues with engine movement prediction (cl_movement).\r
+               // The engine expects the bounding box to be default size, and changing it will cause glitches.\r
+               // This code may be enabled once the engine has the ability to use different bbox sizes for movement prediction.\r
+               if(self.crouch)\r
+               {\r
+                       //setsize (self, PL_CROUCH_MIN * self.scale, PL_CROUCH_MAX * self.scale);\r
+                       if(!self.stat_eaten)\r
+                               self.view_ofs = PL_CROUCH_VIEW_OFS * self.scale;\r
+               }\r
+               else\r
+               {\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
+               }\r
        }\r
-       else\r
+\r
+       if(self.stat_eaten && cvar("g_vore_neighborprey_distance"))\r
        {\r
-               //setsize (self, PL_MIN * self.scale, PL_MAX * self.scale);\r
-               if not(self.predator.classname == "player" || self.fakeprey > 1)\r
-                       self.view_ofs = PL_VIEW_OFS * self.scale;\r
+               // resize prey if neighborprey is enabled\r
+               self.scale *= cvar("g_vore_neighborprey_scale");\r
        }\r
 }\r
 \r
@@ -2620,7 +2632,7 @@ void PlayerPreThink (void)
                        }\r
                }\r
 \r
-               ApplyHealthSize();\r
+               SetPlayerSize();\r
 \r
                FixPlayermodel();\r
 \r