From: MirceaKitsune Date: Wed, 13 Jul 2011 14:36:06 +0000 (+0300) Subject: Cover some holes in my last code X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=c9052d1f1faa6ef66d413e5af582278cb2596a7e;ds=sidebyside Cover some holes in my last code --- diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc index 3507b274..f1aeeec7 100644 --- a/data/qcsrc/client/View.qc +++ b/data/qcsrc/client/View.qc @@ -297,8 +297,8 @@ void CSQC_UpdateView(float w, float h) pmove_org = warpzone_fixview_origin - vo; input_angles = warpzone_fixview_angles; - if(last_health <= 0 && getstati(STAT_HEALTH) > 0) - if not(spectatee_status > 0 && last_spectatee != spectatee_status) // not if we switched players and that detects a different health + if((last_health <= 0 && getstati(STAT_HEALTH) > 0) || (!spectatee_status && last_spectatee)) // also cover switching from a spectator to a player instantly + if not(spectatee_status && last_spectatee != spectatee_status) // not if we switched players and that detects a different health respawned = TRUE; // stays true for one frame // event chase camera @@ -1045,7 +1045,7 @@ void CSQC_UpdateView(float w, float h) } if(cvar("cl_flash_vore")) if(!respawned) // guards against a bug - if not(spectatee_status > 0 && last_spectatee != spectatee_status) // not if we switched players and that detects a different stomach load + if not(spectatee_status && last_spectatee != spectatee_status) // not if we switched players and that detects a different stomach load { float vore_flash_state; if(getstati(STAT_VORE_EATEN))