Allow specifying health at which the player is default size

[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 569769df9d361f47cec88b0e0e3cabf834a66e10..9ca8a4e7627b0f1991be5c944a4cc4ce611a0b59 100644 (file)
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -2251,16 +2251,30 @@ void ApplyHealthSize()
        if not(cvar("g_healthsize"))\r
                return;\r
 \r
-       self.scale = self.health / 100; // ranges between 0 and 100\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
-               setsize (self, PL_CROUCH_MIN * self.scale, PL_CROUCH_MAX * self.scale);\r
+       if(self.predator.classname == "player" || self.fakeprey)\r
+       {\r
+               self.view_ofs = PL_CROUCH_VIEW_OFS * self.predator.scale;\r
+               self.scale = 0;\r
+       }\r
        else\r
-               setsize (self, PL_MIN * self.scale, PL_MAX * self.scale);*/\r
+       {\r
+               self.scale = cvar("g_healthsize") / self.health;\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
+                       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
+                       self.view_ofs = PL_VIEW_OFS * self.scale;\r
+               }\r
+       }\r
 }\r
 \r
 void ObserverThink()\r