Merge branch 'fruitiex/newpanelhud' into fruitiex/fruitbalance

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

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 118f63ce2f5bf73dd8de43a1b8485c43cdff8473..3033cfa78a7cc3b6de68a8d84ca3c73eb98ccbd5 100644 (file)
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -137,7 +137,7 @@ vector GetCurrentFov(float fov)
                        zoomspeed = 3.5;
 
        zoomdir = button_zoom;
-       if(getstati(STAT_ACTIVEWEAPON) == WEP_NEX) // do NOT use switchweapon here
+       if(getstati(STAT_ACTIVEWEAPON) == WEP_NEX || (getstati(STAT_ACTIVEWEAPON) == WEP_CAMPINGRIFLE && campingrifle_scope)) // do NOT use switchweapon here
                zoomdir += button_attack2;
        if(spectatee_status > 0 || isdemo())
        {
@@ -341,6 +341,7 @@ void CSQC_Demo_Camera();
 float HUD_WouldDrawScoreboard ();
 float view_set;
 float camera_mode;
+float reticle_type;
 string NextFrameCommand;
 void CSQC_SPIDER_HUD();
 void CSQC_RAPTOR_HUD();
@@ -354,6 +355,8 @@ void CSQC_UpdateView(float w, float h)
        float f, i, j;
        vector v, vo;
 
+       vector reticle_pos, reticle_size;
+
        WaypointSprite_Load();
 
        if(spectatee_status)
@@ -432,7 +435,7 @@ void CSQC_UpdateView(float w, float h)
        if(intermission && !isdemo() && !(calledhooks & HOOK_END))
                if(calledhooks & HOOK_START)
                {
-                       localcmd("\ncl_hook_gameend;");
+                       localcmd("\ncl_hook_gameend\n");
                        calledhooks |= HOOK_END;
                }
 
@@ -474,6 +477,12 @@ void CSQC_UpdateView(float w, float h)
        if(last_weapon != activeweapon) {
                weapontime = time;
                last_weapon = activeweapon;
+
+               e = get_weaponinfo(activeweapon);
+               if(e.netname != "")
+                       localcmd(strcat("\ncl_hook_activeweapon ", e.netname), "\n");
+               else
+                       localcmd("\ncl_hook_activeweapon none\n");
        }
 
        // ALWAYS Clear Current Scene First
@@ -549,6 +558,45 @@ void CSQC_UpdateView(float w, float h)
        // next R_RenderScene call
        drawstring('0 0 0', "", '1 1 0', '1 1 1', 0, 0);
 
+       // Draw the aiming reticle for weapons that use it
+       // reticle_type is changed to the item we are zooming / aiming with, to decide which reticle to use
+       // It must be a persisted float for fading out to work properly (you let go of the zoom button for
+       // the view to go back to normal, so reticle_type would become 0 as we fade out)
+       if(spectatee_status || getstati(STAT_HEALTH) <= 0)
+               reticle_type = 0; // prevent reticle from showing during the respawn zoom effect or for spectators
+       else if(button_zoom)
+               reticle_type = 1; // normal zoom
+       else if(activeweapon == WEP_NEX && button_attack2 || activeweapon == WEP_CAMPINGRIFLE && button_attack2)
+               reticle_type = 2; // nex zoom
+
+       if(cvar("cl_reticle_stretch"))
+       {
+               reticle_size_x = vid_conwidth;
+               reticle_size_y = vid_conheight;
+               reticle_pos_x = 0;
+               reticle_pos_y = 0;
+       }
+       else
+       {
+               reticle_size_x = max(vid_conwidth, vid_conheight);
+               reticle_size_y = max(vid_conwidth, vid_conheight);
+               reticle_pos_x = (vid_conwidth - reticle_size_x) / 2;
+               reticle_pos_y = (vid_conheight - reticle_size_y) / 2;
+       }
+
+       if(cvar("cl_reticle_item_normal"))
+       {
+               precache_pic("gfx/reticle_normal");
+               if(reticle_type == 1 && current_zoomfraction)
+                       drawpic(reticle_pos, "gfx/reticle_normal", reticle_size, '1 1 1', current_zoomfraction * cvar("cl_reticle_item_normal"), DRAWFLAG_NORMAL);
+       }
+       if(cvar("cl_reticle_item_nex"))
+       {
+               precache_pic("gfx/reticle_nex");
+               if(reticle_type == 2 && current_zoomfraction)
+                       drawpic(reticle_pos, "gfx/reticle_nex", reticle_size, '1 1 1', current_zoomfraction * cvar("cl_reticle_item_nex"), DRAWFLAG_NORMAL);
+       }
+
        // Draw the mouse cursor
        // NOTE: drawpic must happen after R_RenderScene for some reason
        //drawpic(getmousepos(), "gfx/cursor.tga", '11 14 0', '1 1 1', 1, 0);
@@ -730,7 +778,7 @@ void CSQC_UpdateView(float w, float h)
                                        bullets = 0;
 
 #define CROSSHAIR_DRAW_RING(i,j,sz,wcross_name,wcross_alpha) \
-                               drawpic(wcross_origin - ('0.5 0 0' * (sz * wcross_size_x * ring_scale + i * wcross_blur) + '0 0.5 0' * (sz * wcross_size_y * ring_scale + j * wcross_blur)), strcat("gfx/hud/", cvar_string("hud_skin"), "/rifle_ring_", ftos(bullets)), sz * wcross_size * ring_scale, wcross_color, wcross_alpha, DRAWFLAG_NORMAL)
+                               drawpic(wcross_origin - ('0.5 0 0' * (sz * wcross_size_x * ring_scale + i * wcross_blur) + '0 0.5 0' * (sz * wcross_size_y * ring_scale + j * wcross_blur)), strcat("gfx/rifle_ring_", ftos(bullets)), sz * wcross_size * ring_scale, wcross_color, wcross_alpha, DRAWFLAG_NORMAL)
 
 #define CROSSHAIR_DO_BLUR(M,sz,wcross_name,wcross_alpha) \
                                do \
@@ -1141,6 +1189,18 @@ void CSQC_common_hud(void)
        switch(hud)
        {
                case HUD_NORMAL:
+                       // do some accuracy var caching
+                       float i;
+                       if(!(gametype == GAME_RACE || gametype == GAME_CTS))
+                       {
+                               acc_levels = tokenize(cvar_string("hud_panel_weapons_accuracy_color_levels"));
+                               if (acc_levels > MAX_ACCURACY_LEVELS)
+                                       acc_levels = MAX_ACCURACY_LEVELS;
+
+                               for (i = 0; i < acc_levels; ++i)
+                                       acc_lev[i] = stof(argv(i));
+                       }
+
                        // hud first
                        HUD_Main();