From: MirceaKitsune Date: Sun, 1 May 2011 20:04:37 +0000 (+0300) Subject: Only use the event chasecam when we aren't fake prey (dead and outside of the stomach) X-Git-Url: https://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=e774793d5c0144e68d43e363d36c11d91c97774b;ds=sidebyside 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 1a758a79..6ae6d038 100644 --- 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 if(cvar("chase_active") <= 0) // greater than 0 means it's enabled manually, and this code is skipped { - if(spectatee_status >= 0 && (cvar("cl_eventchase_death") && getstati(STAT_HEALTH) <= 0 && !intermission)) + if(!getstati(STAT_VORE_EATEN) && spectatee_status >= 0 && (cvar("cl_eventchase_death") && getstati(STAT_HEALTH) <= 0 && !intermission)) { // We must enable chase_active to get a third person view (weapon viewmodel hidden and own player model showing). // Ideally, there should be another way to enable third person cameras, such as through R_SetView() diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc index 9e6a5f94..9837a563 100644 --- a/data/qcsrc/server/vore.qc +++ b/data/qcsrc/server/vore.qc @@ -500,8 +500,10 @@ void Vore() self.colormod_z = 1; } - // set all vore related stats - if(self.predator.classname == "player") + // set all vore stats + if(self.fakeprey) + self.stat_eaten = num_for_edict(self.fakepredator); + else if(self.predator.classname == "player") { self.stat_stomachload = self.predator.stomach_load; // necessary for the stomach board self.stat_digesting = self.predator.digesting; // necessary for the stomach board