Only use the event chasecam when we aren't fake prey (dead and outside of the stomach)

diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc
index 1a758a7925ead45b8d6ae4747da12a5b943a5db2..6ae6d038c7a7b80db19593a418452c6ea1aa2417 100644 (file)
--- a/data/qcsrc/client/View.qc
+++ b/data/qcsrc/client/View.qc
@@ -298,7 +298,7 @@ void CSQC_UpdateView(float w, float h)
        // event chase camera\r
        if(cvar("chase_active") <= 0) // greater than 0 means it's enabled manually, and this code is skipped\r
        {\r
-               if(spectatee_status >= 0 && (cvar("cl_eventchase_death") && getstati(STAT_HEALTH) <= 0 && !intermission))\r
+               if(!getstati(STAT_VORE_EATEN) && spectatee_status >= 0 && (cvar("cl_eventchase_death") && getstati(STAT_HEALTH) <= 0 && !intermission))\r
                {\r
                        // We must enable chase_active to get a third person view (weapon viewmodel hidden and own player model showing).\r
                        // Ideally, there should be another way to enable third person cameras, such as through R_SetView()\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 9e6a5f945b1c727aedebccf438cc5245a63d5573..9837a563848b0081e3378a66139958a325aeb7d3 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -500,8 +500,10 @@ void Vore()
                        self.colormod_z = 1;\r
        }\r
 \r
-       // set all vore related stats\r
-       if(self.predator.classname == "player")\r
+       // set all vore stats\r
+       if(self.fakeprey)\r
+               self.stat_eaten = num_for_edict(self.fakepredator);\r
+       else if(self.predator.classname == "player")\r
        {\r
                self.stat_stomachload = self.predator.stomach_load; // necessary for the stomach board\r
                self.stat_digesting = self.predator.digesting; // necessary for the stomach board\r