Copy spectatee scale

[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 2bbc265bc4d591e7d0fee36d540cc66eee29e7cc..73bc1803fb1e9ba69d26fd628a90b9552121f9e8 100644 (file)
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -522,20 +522,14 @@ float Client_customizeentityforclient()
        if not(other.cvar_chase_active || other.classname == "observer") // the observer check prevents a bug\r
        if(other.predator == self || other.fakepredator == self)\r
        {\r
-               if(self.model != stomachmodel) // don't execute each frame\r
-               {\r
-                       Client_setmodel(stomachmodel);\r
-                       self.alpha = other.cvar_cl_vore_stomachmodel;\r
-               }\r
+               Client_setmodel(stomachmodel);\r
+               self.alpha = other.cvar_cl_vore_stomachmodel;\r
                return TRUE;\r
        }\r
 \r
-       if(self.model != setmodel_state())  // don't execute each frame\r
-       {\r
-               Client_setmodel(setmodel_state());\r
-               if not(self.predator.classname == "player" || self.fakeprey)\r
-                       self.alpha = default_player_alpha;\r
-       }\r
+       Client_setmodel(setmodel_state());\r
+       if not(self.predator.classname == "player" || self.fakeprey)\r
+               self.alpha = default_player_alpha;\r
        return TRUE;\r
 }\r
 \r
@@ -2054,6 +2048,7 @@ void SpectateCopy(entity spectatee) {
        self.dmg_save = spectatee.dmg_save;\r
        self.dmg_inflictor = spectatee.dmg_inflictor;\r
        self.angles = spectatee.v_angle;\r
+       self.scale = spectatee.scale;\r
        self.fixangle = TRUE;\r
        self.stomach_load = spectatee.stomach_load;\r
        self.stat_eaten = spectatee.stat_eaten;\r
@@ -2252,6 +2247,33 @@ float vercmp(string v1, string v2)
        return vercmp_recursive(v1, v2);\r
 }\r
 \r
+void ApplyHealthSize()\r
+{\r
+       // change player scale based on the amount of health we have\r
+\r
+       if not(cvar("g_healthsize"))\r
+               return;\r
+\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)\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 not(self.predator.classname == "player" || self.fakeprey)\r
+                       self.view_ofs = PL_VIEW_OFS * self.scale;\r
+       }\r
+}\r
+\r
 void ObserverThink()\r
 {\r
        if (self.flags & FL_JUMPRELEASED) {\r
@@ -2574,6 +2596,8 @@ void PlayerPreThink (void)
                        }\r
                }\r
 \r
+               ApplyHealthSize();\r
+\r
                FixPlayermodel();\r
 \r
                GrabberFrame();\r