Merge branch 'master' into terencehill/crosshair_fix

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

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 00c395893c596f4d142d0db66d70f4a4241faebf..074a3be5eec6f8d63eb1e671e48e70ca44189980 100644 (file)
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -349,6 +349,8 @@ void CSQC_RAPTOR_HUD();
 vector freeze_pmove_org, freeze_input_angles;
 entity nightvision_noise, nightvision_noise2;
 
+float pickup_crosshair_time, pickup_crosshair_size;
+
 void CSQC_UpdateView(float w, float h)
 {
        entity e;
@@ -356,6 +358,7 @@ void CSQC_UpdateView(float w, float h)
        float f, i, j;
        vector v, vo;
        vector vf_size, vf_min;
+       float a;
 
        vf_size = R_SetView3fv(VF_SIZE);
        vf_min = R_SetView3fv(VF_MIN);
@@ -567,7 +570,6 @@ void CSQC_UpdateView(float w, float h)
        {
                // apply night vision effect
                vector rgb, tc_00, tc_01, tc_10, tc_11;
-               float a;
 
                if(!nightvision_noise)
                {
@@ -779,9 +781,25 @@ void CSQC_UpdateView(float w, float h)
                                wcross_scale = 1;
                        }
 
+                       if(cvar("crosshair_pickup"))
+                       {
+                               if(pickup_crosshair_time < getstatf(STAT_LAST_PICKUP))
+                               {
+                                       pickup_crosshair_size = 1;
+                                       pickup_crosshair_time = getstatf(STAT_LAST_PICKUP);
+                               }
+
+                               if(pickup_crosshair_size > 0)
+                                       pickup_crosshair_size -= cvar("crosshair_pickup_speed") * frametime;
+                               else
+                                       pickup_crosshair_size = 0;
+
+                               wcross_scale += sin(pickup_crosshair_size) * cvar("crosshair_pickup");
+                       }
+
                        if(shottype == SHOTTYPE_HITENEMY)
                                wcross_scale *= cvar("crosshair_hittest"); // is not queried if hittest is 0
-                       else if(shottype == SHOTTYPE_HITTEAM)
+                       if(shottype == SHOTTYPE_HITTEAM)
                                wcross_scale /= cvar("crosshair_hittest"); // is not queried if hittest is 0
 
                        f = cvar("crosshair_effect_speed");
@@ -1083,7 +1101,7 @@ void CSQC_SPIDER_HUD()
 
 void CSQC_RAPTOR_HUD()
 {
-       float rockets, reload, heat, hp, shield, energy;
+       float reload, hp, shield, energy;
        vector picsize, hudloc;
 
     // Fetch health & ammo stats