Merge remote-tracking branch 'origin/terencehill/forced_intermission_eventchase'
authorSamual Lenks <samual@xonotic.org>
Wed, 12 Dec 2012 21:44:46 +0000 (16:44 -0500)
committerSamual Lenks <samual@xonotic.org>
Wed, 12 Dec 2012 21:44:46 +0000 (16:44 -0500)
Conflicts:
qcsrc/client/View.qc

1  2 
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);