Finally, remove the last known bugs, and nail the last known issues in the fulldigest...

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index 47f27497ea643705c706b4527f01f4027fb0df4d..fe30cae7843ee007ff0bbadd1436d42466f3db62 100644 (file)
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -516,7 +516,7 @@ float Client_customizeentityforclient()
        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.fakepredator.classname == "player")\r
+               if not(self.predator.classname == "player" || self.fakeprey)\r
                        self.alpha = default_player_alpha;\r
                return TRUE;\r
        }\r
@@ -530,7 +530,7 @@ float Client_customizeentityforclient()
                return TRUE;\r
        }\r
        Client_setmodel(setmodel_state());\r
-       if not(self.predator.classname == "player" || self.fakepredator.classname == "player")\r
+       if not(self.predator.classname == "player" || self.fakeprey)\r
                self.alpha = default_player_alpha;\r
        return TRUE;\r
 }\r
@@ -828,8 +828,6 @@ 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
@@ -924,6 +922,8 @@ void PutClientInServer (void)
 \r
                SetCustomizer(self, Client_customizeentityforclient, Client_uncustomizeentityforclient);\r
 \r
+               Vore_DeadPrey_Detach(self);\r
+\r
                self.model = "";\r
                FixPlayermodel();\r
 \r

diff --git a/data/qcsrc/server/cl_player.qc b/data/qcsrc/server/cl_player.qc
index af48331f49b5b446cde95857e459cef71413b549..120c6d2f090c732f85dc24be6d1a098ee9137c46 100644 (file)
--- a/data/qcsrc/server/cl_player.qc
+++ b/data/qcsrc/server/cl_player.qc
@@ -104,7 +104,7 @@ void WeaponStats_LogKill(float awep, float vwep)
 void CopyBody(float keepvelocity)\r
 {\r
        local entity oldself;\r
-       if (self.fakepredator.classname == "player")\r
+       if (self.fakeprey)\r
                return;\r
        if (self.effects & EF_NODRAW || self.alpha < 0)\r
                return;\r

diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh
index f175727db163ccb53e90637a6198543f7086ec16..d1834f6590549559a9a2fc98a08567733072f4e3 100644 (file)
--- a/data/qcsrc/server/defs.qh
+++ b/data/qcsrc/server/defs.qh
@@ -70,6 +70,7 @@ float maxclients;
 .float digesting;\r
 .float stomach_load;\r
 .float weapon_delay;\r
+.float fakeprey;\r
 .float stat_eaten, stat_stomachload, stat_digesting, stat_canleave;\r
 \r
 // Fields\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index f8f986313fa7626e3be51aa12909231fcaa22af7..c29dc25281e3ec3c677ff992812622ab79660646 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -231,11 +231,12 @@ void Vore_DeadPrey_Configure(entity e)
 {\r
        // ran when the fulldigest feature is enabled and prey stays inside the stomach after dying\r
 \r
-       if(e.fakepredator.classname == "player" || e.predator.classname != "player") // already configured\r
+       if(e.fakeprey || e.predator.classname != "player") // already configured\r
                return;\r
 \r
        // this entity is like e.predator but for dead prey, to avoid conflicts\r
        e.fakepredator = e.predator;\r
+       e.fakeprey = TRUE;\r
 \r
        // first release the prey from the predator, as dead prey needs to be attached differently\r
        // the predator's stomach load is also decreased, as dead prey doesn't count any more\r
@@ -251,7 +252,6 @@ void Vore_DeadPrey_Configure(entity e)
 \r
        // completely remove the dead body\r
        e.alpha = -1;\r
-       setmodel(e, "");\r
 }\r
 \r
 void Vore_DeadPrey_Detach(entity e)\r
@@ -264,6 +264,9 @@ void Vore_DeadPrey_Detach(entity e)
 \r
        e.fakepredator = world;\r
        e.aiment = world;\r
+\r
+       if(!e.deadflag)\r
+               e.fakeprey = FALSE;\r
 }\r
 \r
 void Vore_PreyRelease(entity e)\r