X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2FView.qc;h=3033cfa78a7cc3b6de68a8d84ca3c73eb98ccbd5;hp=6d89e8d899cf2fa9a55697653f7e0bb847eb85e8;hb=b46fdcee5c729ccdf485d908803d06bbfdac2a8c;hpb=baa0f9610afb1e315c8dc067f50cf1521339aedd diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc index 6d89e8d89..3033cfa78 100644 --- 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()) { @@ -566,7 +566,7 @@ void CSQC_UpdateView(float w, float h) 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) + else if(activeweapon == WEP_NEX && button_attack2 || activeweapon == WEP_CAMPINGRIFLE && button_attack2) reticle_type = 2; // nex zoom if(cvar("cl_reticle_stretch"))