Canswallow indicator for crosshair. When enabled, the crosshair will turn into a...

[voretournament/voretournament.git] / data / qcsrc / client / View.qc

diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc
index dec78f340977807bb2b6b4bff61e974d3e9a1a89..1daa4cb4bde22f8d8ed81e8aefb85ef8b0612b16 100644 (file)
--- a/data/qcsrc/client/View.qc
+++ b/data/qcsrc/client/View.qc
@@ -892,6 +892,12 @@ void CSQC_UpdateView(float w, float h)
                Sbar_DrawCenterPrint(); // draw centerprint messages even if viewsize >= 120\r
        }\r
 \r
+       float weapon_clipload, weapon_clipsize, ring_scale;\r
+\r
+       float swallow_indicator;\r
+       if(cvar("crosshair_swallowindicator"))\r
+               swallow_indicator = getstati(STAT_VORE_CANSWALLOW);\r
+\r
        float hud;\r
        hud = getstati(STAT_HUD);\r
 \r
@@ -909,6 +915,7 @@ void CSQC_UpdateView(float w, float h)
                        wcross_origin = project_3d_to_2d(view_origin + MAX_SHOT_DISTANCE * view_forward);\r
                        wcross_origin_z = 0;\r
                        if(cvar("crosshair_hittest"))\r
+                       if(!swallow_indicator)\r
                        {\r
                                vector wcross_oldorigin;\r
                                wcross_oldorigin = wcross_origin;\r
@@ -927,10 +934,14 @@ void CSQC_UpdateView(float w, float h)
                        else\r
                                shottype = SHOTTYPE_HITWORLD;\r
 \r
-                       float weapon_clipload, weapon_clipsize, ring_scale;\r
-\r
                        string wcross_style;\r
-                       wcross_style = cvar_string("crosshair");\r
+\r
+                       if(swallow_indicator  > 1)\r
+                               wcross_style = "_canswallow_team.tga";\r
+                       else if(swallow_indicator > 0)\r
+                               wcross_style = "_canswallow.tga";\r
+                       else\r
+                               wcross_style = cvar_string("crosshair");\r
 \r
                        if (wcross_style != "0") {\r
                                vector wcross_color, wcross_size;\r
@@ -1061,10 +1072,14 @@ void CSQC_UpdateView(float w, float h)
                                CROSSHAIR_DRAW(wcross_resolution, wcross_name, wcross_alpha * f);\r
                                wcross_name_alpha_goal_prev = f;\r
 \r
+                               if(swallow_indicator)\r
+                                       wcross_size *= cvar("crosshair_swallowindicator_size");\r
+\r
                                // ring around crosshair representing bullets left in weapon clip\r
                                weapon_clipload = getstati(STAT_WEAPON_CLIPLOAD);\r
                                a = cvar("crosshair_ring_alpha");\r
                                if (weapon_clipload && a)\r
+                               if (!swallow_indicator)\r
                                {\r
                                        weapon_clipsize = getstati(STAT_WEAPON_CLIPSIZE);\r
                                        ring_scale = cvar("crosshair_ring_size");\r