Fix player sizing working in reverse

[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 a946c85474a08987fa709bf143ea960b6bbfa0ed..c26a5530cbeb73f436dee938ef2fc799e28accef 100644 (file)
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -406,6 +406,7 @@ string CheckPlayerModel(string plyermodel) {
        {\r
                if(substring(plyermodel,-4,4) != ".zym")\r
                if(substring(plyermodel,-4,4) != ".dpm")\r
+               if(substring(plyermodel,-4,4) != ".iqm")\r
                if(substring(plyermodel,-4,4) != ".md3")\r
                if(substring(plyermodel,-4,4) != ".psk")\r
                        return FallbackPlayerModel;\r
@@ -417,11 +418,12 @@ string CheckPlayerModel(string plyermodel) {
        return plyermodel;\r
 }\r
 \r
-void setmodel_apply(string modelname)\r
+void setmodel_apply(string modelname, float reset_anims)\r
 {\r
        precache_model(modelname);\r
        setmodel(self, modelname); // players have high precision\r
-       player_setupanimsformodel();\r
+       if(reset_anims)\r
+               player_setupanimsformodel();\r
 }\r
 \r
 string setmodel_state()\r
@@ -457,7 +459,7 @@ void Client_setmodel(string applymodel)
        applymodel = CheckPlayerModel(applymodel); // this is never "", so no endless loop\r
        m1 = self.mins;\r
        m2 = self.maxs;\r
-       setmodel_apply(applymodel);\r
+       setmodel_apply(applymodel, FALSE);\r
        setsize (self, m1, m2);\r
 }\r
 \r
@@ -469,7 +471,7 @@ void Client_uncustomizeentityforclient()
 float Client_customizeentityforclient()\r
 {\r
        entity modelsource;\r
-       string applymodel;\r
+       string stomachmodel;\r
 \r
        if(self.modelindex == 0)\r
                return TRUE;\r
@@ -511,24 +513,20 @@ float Client_customizeentityforclient()
        // now change the predator's player model into a stomach model for the prey\r
        // in other words, when a player is swallowed by another player, the predator becomes an inward stomach model so the prey can see theirself in the stomach\r
        // this is only visible to the prey however, otherwise players would appear as a floating stomach to everyone (ewww)\r
+       stomachmodel = strcat(substring(self.playermodel, 0, strlen(self.playermodel) - 4), "_stomach.md3"); // 4 is the extension length\r
 \r
-       // don't do this if we have chase_active enabled, as we'd be seeing a floating stomach from third person view\r
-       if(other.cvar_chase_active > 0 || other.classname == "observer") // the classname check prevents a bug\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
        if(other.spectatee_status)\r
                other = other.enemy; // also do this for the player we are spectating\r
+\r
+       // don't do this if we have chase_active enabled, as we'd be seeing a floating stomach from third person view\r
+       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
-               applymodel = strcat(substring(self.playermodel, 0, strlen(self.playermodel) - 4), "_stomach.md3"); // 4 is the extension length\r
-               Client_setmodel(applymodel);\r
+               Client_setmodel(stomachmodel);\r
                self.alpha = other.cvar_cl_vore_stomachmodel;\r
                return TRUE;\r
        }\r
+\r
        Client_setmodel(setmodel_state());\r
        if not(self.predator.classname == "player" || self.fakeprey)\r
                self.alpha = default_player_alpha;\r
@@ -725,7 +723,7 @@ void FixPlayermodel()
                {\r
                        m1 = self.mins;\r
                        m2 = self.maxs;\r
-                       setmodel_apply (defaultmodel);\r
+                       setmodel_apply (defaultmodel, TRUE);\r
                        setsize (self, m1, m2);\r
                        chmdl = TRUE;\r
                }\r
@@ -738,7 +736,7 @@ void FixPlayermodel()
                        self.playermodel = CheckPlayerModel(self.playermodel); // this is never "", so no endless loop\r
                        m1 = self.mins;\r
                        m2 = self.maxs;\r
-                       setmodel_apply (self.playermodel);\r
+                       setmodel_apply (self.playermodel, TRUE);\r
                        setsize (self, m1, m2);\r
                        chmdl = TRUE;\r
                }\r
@@ -828,6 +826,8 @@ void PutClientInServer (void)
 \r
                RemoveGrabber(self); // Wazat's Grabber\r
 \r
+               Vore_DeadPrey_Detach(self);\r
+\r
                self.classname = "player";\r
                self.wasplayer = TRUE;\r
                self.iscreature = TRUE;\r
@@ -922,8 +922,6 @@ void PutClientInServer (void)
 \r
                SetCustomizer(self, Client_customizeentityforclient, Client_uncustomizeentityforclient);\r
 \r
-               Vore_DeadPrey_Detach(self);\r
-\r
                self.model = "";\r
                FixPlayermodel();\r
 \r
@@ -2248,6 +2246,37 @@ float vercmp(string v1, string v2)
        return vercmp_recursive(v1, v2);\r
 }\r
 \r
+void ApplyHealthSize()\r
+{\r
+       if not(cvar("g_healthsize"))\r
+               return;\r
+\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
+       {\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
+                       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
 {\r
        if (self.flags & FL_JUMPRELEASED) {\r
@@ -2570,6 +2599,9 @@ void PlayerPreThink (void)
                        }\r
                }\r
 \r
+               // health based player size\r
+               ApplyHealthSize();\r
+\r
                FixPlayermodel();\r
 \r
                GrabberFrame();\r