X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fweapon%2Fvaporizer.qc;fp=qcsrc%2Fcommon%2Fweapons%2Fweapon%2Fvaporizer.qc;h=71bc39a7c7e16c8cee309c7b776afd8a2aed3b66;hb=81df9076546717a7aa7c46bb894fcf2b7dc8e30a;hp=25aa1b6658c62367fe0f9787f7230f2be7678a4c;hpb=74ae9d49fce8a7363efee2c825688ac2aa96d8cf;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/weapons/weapon/vaporizer.qc b/qcsrc/common/weapons/weapon/vaporizer.qc index 25aa1b665..71bc39a7c 100644 --- a/qcsrc/common/weapons/weapon/vaporizer.qc +++ b/qcsrc/common/weapons/weapon/vaporizer.qc @@ -297,7 +297,8 @@ METHOD(Vaporizer, wr_think, void(entity thiswep, entity actor, .entity weaponent if(WEP_CVAR_SEC(vaporizer, ammo)) W_DecreaseAmmo(thiswep, actor, WEP_CVAR_SEC(vaporizer, ammo), weaponentity); - BLASTER_SECONDARY_ATTACK(vaporizer, actor, weaponentity); + makevectors(actor.v_angle); + W_Blaster_Attack(actor, weaponentity, WEP_BLASTER.m_id | HITTYPE_SECONDARY); // now do normal refire weapon_thinkf(actor, weaponentity, WFRAME_FIRE2, WEP_CVAR_SEC(vaporizer, animtime), w_ready); @@ -354,7 +355,7 @@ METHOD(Vaporizer, wr_killmessage, Notification(entity thiswep)) METHOD(Vaporizer, wr_impacteffect, void(entity thiswep, entity actor)) { - vector org2 = w_org + w_backoff * 6; + vector org2 = w_org + w_backoff * 2; if(w_deathtype & HITTYPE_SECONDARY) { pointparticles(EFFECT_BLASTER_IMPACT, org2, w_backoff * 1000, 1);