Add code to separate between zoom types (currently between normal zoom and Nex zoom).
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 24 Jun 2010 14:51:28 +0000 (17:51 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 24 Jun 2010 14:51:28 +0000 (17:51 +0300)
qcsrc/client/View.qc

index 0f76b60c2ed0936c147224044d39c11d717cdeb7..3a133760511ad9f9f0bdc948c1c0081a525a81c6 100644 (file)
@@ -552,6 +552,13 @@ void CSQC_UpdateView(float w, float h)
        drawstring('0 0 0', "", '1 1 0', '1 1 1', 0, 0);
 
        // draw the aiming reticle for weapons that use it (eg. Nex)
+       // zoom_type is changed to the item we are zooming with, to decide which reticle to use
+       float zoom_type;
+       if(button_zoom)
+               zoom_type = 0; // normal zoom
+       else if(activeweapon == WEP_NEX && button_attack2)
+               zoom_type = 1; // nex zoom
+
        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;
@@ -559,7 +566,7 @@ void CSQC_UpdateView(float w, float h)
 
        precache_pic("textures/reticle_nex");
        if(cvar("cl_reticle_nex"))
-       if(activeweapon == WEP_NEX && button_attack2)
+       if(zoom_type == 1)
                drawpic(reticle_pos, "textures/reticle_nex", reticle_size, '1 1 1', current_zoomfraction * cvar("cl_reticle_nex"), DRAWFLAG_NORMAL);
 
        // Draw the mouse cursor