Merge remote-tracking branch 'origin/mrbougo/clonefixes'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / View.qc

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index bec4f9e3fd8be5e48ffb55b559b0ead0195d416e..220e44260dcaae33f913f695a7fbda6ccbea7ac6 100644 (file)
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -449,7 +449,9 @@ void UpdateHitsound()
        // varying sound pitch
 
        static float hitsound_time_prev = 0;
-       if (COMPARE_INCREASING(time, hitsound_time_prev) > autocvar_cl_hitsound_antispam_time)
+       // HACK: the only way to get the arc to sound consistent with pitch shift is to ignore cl_hitsound_antispam_time
+       float arc_hack = activeweapon == WEP_ARC && autocvar_cl_hitsound >= 2;
+       if (arc_hack || COMPARE_INCREASING(time, hitsound_time_prev) > autocvar_cl_hitsound_antispam_time)
        {
                if (autocvar_cl_hitsound && unaccounted_damage)
                {
@@ -1015,12 +1017,7 @@ void CSQC_UpdateView(float w, float h)
 
        CSQCPlayer_SetCamera();
 
-#ifdef COMPAT_XON050_ENGINE
-       if(spectatee_status)
-               myteam = GetPlayerColor(spectatee_status - 1);
-       else
-#endif
-               myteam = GetPlayerColor(player_localentnum - 1);
+       myteam = GetPlayerColor(player_localentnum - 1);
 
        if(myteam != prev_myteam)
        {
@@ -1297,15 +1294,9 @@ void CSQC_UpdateView(float w, float h)
 
        // ALWAYS Clear Current Scene First
        clearscene();
-#ifdef WORKAROUND_XON010
-       if(checkextension("DP_CSQC_ROTATEMOVES"))
-       {
-#endif
+
        setproperty(VF_ORIGIN, view_origin);
        setproperty(VF_ANGLES, view_angles);
-#ifdef WORKAROUND_XON010
-       }
-#endif
 
        // FIXME engine bug? VF_SIZE and VF_MIN are not restored to sensible values by this
        setproperty(VF_SIZE, vf_size);