X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmutators%2Fmutator%2Foverkill%2Foknex.qc;h=a30a2bf52136b162cf8384e7ceec8c1a7d0cf14d;hb=cc86793455af29b7a4496d577817e691fcc6c589;hp=85f33714054e1560f40c0ccf28a12a83b1b0c048;hpb=9e0107ad74a31422e209d4f97dbc4fdc9b669727;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/mutators/mutator/overkill/oknex.qc b/qcsrc/common/mutators/mutator/overkill/oknex.qc index 85f337140..a30a2bf52 100644 --- a/qcsrc/common/mutators/mutator/overkill/oknex.qc +++ b/qcsrc/common/mutators/mutator/overkill/oknex.qc @@ -141,7 +141,8 @@ METHOD(OverkillNex, wr_think, void(entity thiswep, entity actor, .entity weapone { // Secondary uses it's own refire timer if refire_type is 1. actor.jump_interval = time + WEP_CVAR_SEC(oknex, refire) * W_WeaponRateFactor(actor); - BLASTER_SECONDARY_ATTACK(oknex, actor, weaponentity); + makevectors(actor.v_angle); + W_Blaster_Attack(actor, weaponentity, WEP_BLASTER.m_id | HITTYPE_SECONDARY); if ((actor.(weaponentity).wframe == WFRAME_IDLE) || (actor.(weaponentity).wframe == WFRAME_FIRE2)) { @@ -180,7 +181,8 @@ METHOD(OverkillNex, wr_think, void(entity thiswep, entity actor, .entity weapone { return; } - BLASTER_SECONDARY_ATTACK(oknex, actor, weaponentity); + makevectors(actor.v_angle); + W_Blaster_Attack(actor, weaponentity, WEP_BLASTER.m_id | HITTYPE_SECONDARY); weapon_thinkf(actor, weaponentity, WFRAME_FIRE2, WEP_CVAR_SEC(oknex, animtime), w_ready); return; } @@ -324,7 +326,7 @@ METHOD(OverkillNex, wr_zoom, bool(entity thiswep, entity actor)) METHOD(OverkillNex, wr_impacteffect, void(entity thiswep, entity actor)) { entity this = actor; - vector org2 = w_org + w_backoff * 6; + vector org2 = w_org + w_backoff * 2; pointparticles(EFFECT_VORTEX_IMPACT, org2, '0 0 0', 1); if(!w_issilent) sound(this, CH_SHOTS, SND_NEXIMPACT, VOL_BASE, ATTN_NORM);