From: Samual Lenks <samual@xonotic.org>
Date: Wed, 12 Dec 2012 21:44:46 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/terencehill/forced_intermission_eventchase'
X-Git-Tag: xonotic-v0.7.0~195
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=f879dea04474678d9a263cf5d8c127415e390ca5

Merge remote-tracking branch 'origin/terencehill/forced_intermission_eventchase'

Conflicts:
	qcsrc/client/View.qc
---

f879dea04474678d9a263cf5d8c127415e390ca5
diff --cc qcsrc/client/View.qc
index e9c21f9dd,cdf86aada..9ffe5a738
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@@ -473,9 -473,16 +473,16 @@@ void CSQC_UpdateView(float w, float h
  			eventchase_current_distance = 0; // start from 0 next time
  		}
  	}
+ 	// workaround for camera stuck between player's legs when using chase_active 1
+ 	// because the engine stops updating the chase_active camera when the game ends
+ 	else if(intermission)
+ 	{
+ 		cvar_settemp("chase_active", "-1");
+ 		eventchase_current_distance = 0;
+ 	}
  
  	// do lockview after event chase camera so that it still applies whenever necessary.
 -	if(autocvar_cl_lockview || (autocvar__hud_configure && spectatee_status <= 0) || intermission > 1)
 +	if(autocvar_cl_lockview || (!autocvar_hud_cursormode && (autocvar__hud_configure && spectatee_status <= 0 || intermission > 1)))
  	{
  		setproperty(VF_ORIGIN, freeze_org);
  		setproperty(VF_ANGLES, freeze_ang);