Allow dead prey to remain in the stomach and be digested. Not as fake prey this time...

diff --git a/data/qcsrc/server/cl_player.qc b/data/qcsrc/server/cl_player.qc
index 1e9f8d438e8d2165cc33257dd43ded389cd5d7a2..b8ca620e7b043fcbba0608893ddd6c096683414a 100644 (file)
--- a/data/qcsrc/server/cl_player.qc
+++ b/data/qcsrc/server/cl_player.qc
@@ -630,19 +630,25 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
                }\r
                // clear waypoints\r
                WaypointSprite_PlayerDead();\r
-               // make the corpse upright (not tilted)\r
-               self.angles_x = 0;\r
-               self.angles_z = 0;\r
-               // don't spin\r
-               self.avelocity = '0 0 0';\r
-               // view from the floor\r
-               self.view_ofs = '0 0 -8';\r
-               // toss the corpse\r
-               self.movetype = MOVETYPE_TOSS;\r
-               // shootable corpse\r
-               self.solid = SOLID_CORPSE;\r
-               // don't stick to the floor\r
-               self.flags &~= FL_ONGROUND;\r
+\r
+               // configure these properties if the dead body is not a prey\r
+               if(!self.stat_eaten)\r
+               {\r
+                       // make the corpse upright (not tilted)\r
+                       self.angles_x = 0;\r
+                       self.angles_z = 0;\r
+                       // don't spin\r
+                       self.avelocity = '0 0 0';\r
+                       // view from the floor\r
+                       self.view_ofs = '0 0 -8';\r
+                       // toss the corpse\r
+                       self.movetype = MOVETYPE_TOSS;\r
+                       // shootable corpse\r
+                       self.solid = SOLID_CORPSE;\r
+                       // don't stick to the floor\r
+                       self.flags &~= FL_ONGROUND;\r
+               }\r
+\r
                // dying animation\r
                self.deadflag = DEAD_DYING;\r
                // when to allow respawn\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 274dae6a4ad3b90aed8cfcd558118b6cc20464af..b53642b1461c761396c642e33e8416ae93e1a5d5 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -797,11 +797,11 @@ void Vore()
        if(!self.stat_eaten)\r
                return;\r
 \r
-       if(self.deadflag != DEAD_NO) // we're dead, do what we must\r
+       /*if(self.deadflag != DEAD_NO) // we're dead, do what we must\r
        {\r
                Vore_Regurgitate(self);\r
                return;\r
-       }\r
+       }*/\r
 \r
        if(self.predator.deadflag != DEAD_NO) // do we want to be in a dead furry x_x\r
        {\r