From: Mario Date: Thu, 12 Nov 2015 05:57:17 +0000 (+1000) Subject: Add a mutator hook to customise vortex beam X-Git-Tag: xonotic-v0.8.2~1677 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0c255f41a9f603b2cdda9fbc990348d84757dc78;p=xonotic%2Fxonotic-data.pk3dir.git Add a mutator hook to customise vortex beam --- diff --git a/qcsrc/client/mutators/events.qh b/qcsrc/client/mutators/events.qh index 99707105a..34f75b0ea 100644 --- a/qcsrc/client/mutators/events.qh +++ b/qcsrc/client/mutators/events.qh @@ -121,4 +121,13 @@ MUTATOR_HOOKABLE(HUD_Draw_overlay, EV_HUD_Draw_overlay); MUTATOR_HOOKABLE(HUD_Powerups_add, EV_NO_ARGS); +/** Return true to not draw any vortex beam */ +#define EV_Particles_VortexBeam(i, o) \ + /**/ i(vector, vbeam_shotorg) \ + /**/ i(vector, vbeam_endpos) \ + /**/ +vector vbeam_shotorg; +vector vbeam_endpos; +MUTATOR_HOOKABLE(Particles_VortexBeam, EV_Particles_VortexBeam); + #endif diff --git a/qcsrc/common/weapons/weapon/vortex.qc b/qcsrc/common/weapons/weapon/vortex.qc index bae7cca3d..8a90679b8 100644 --- a/qcsrc/common/weapons/weapon/vortex.qc +++ b/qcsrc/common/weapons/weapon/vortex.qc @@ -91,7 +91,8 @@ NET_HANDLE(TE_CSQC_VORTEXBEAMPARTICLE, bool isNew) charge = sqrt(charge); // divide evenly among trail spacing and alpha particles_alphamin = particles_alphamax = particles_fade = charge; - if (autocvar_cl_particles_oldvortexbeam && (getstati(STAT_ALLOW_OLDVORTEXBEAM) || isdemo())) + if(!MUTATOR_CALLHOOK(Particles_VortexBeam, shotorg, endpos)) + if(autocvar_cl_particles_oldvortexbeam && (getstati(STAT_ALLOW_OLDVORTEXBEAM) || isdemo())) WarpZone_TrailParticles_WithMultiplier(world, particleeffectnum(EFFECT_VORTEX_BEAM_OLD), shotorg, endpos, 1, PARTICLES_USEALPHA | PARTICLES_USEFADE); else WarpZone_TrailParticles_WithMultiplier(world, particleeffectnum(EFFECT_VORTEX_BEAM), shotorg, endpos, 1, PARTICLES_USEALPHA | PARTICLES_USEFADE);