X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fweapon%2Frifle.qc;h=4794e866a0ce897d1eb0db0aceb538f0aa7fecc0;hb=b9c4f697a81bb47446239bdfa8ec1fc6083935b5;hp=6dbcd31c280a6593fafeb67a0f1fd338ed5674f9;hpb=7779bdd488de14ec800782f2904d49a7f5aa33f8;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/weapons/weapon/rifle.qc b/qcsrc/common/weapons/weapon/rifle.qc index 6dbcd31c2..4794e866a 100644 --- a/qcsrc/common/weapons/weapon/rifle.qc +++ b/qcsrc/common/weapons/weapon/rifle.qc @@ -241,6 +241,10 @@ METHOD(Rifle, wr_killmessage, Notification(entity thiswep)) return WEAPON_RIFLE_MURDER; } } +METHOD(Rifle, wr_zoom, bool(entity thiswep, entity actor)) +{ + return PHYS_INPUT_BUTTON_ATCK2(actor) && WEP_CVAR(rifle, secondary) == 0; +} #endif #ifdef CSQC @@ -262,7 +266,7 @@ METHOD(Rifle, wr_init, void(entity thiswep)) precache_pic("gfx/reticle_nex"); } } -METHOD(Rifle, wr_zoomreticle, bool(entity thiswep)) +METHOD(Rifle, wr_zoom, bool(entity thiswep, entity actor)) { if(button_zoom || zoomscript_caught) {