From: terencehill Date: Thu, 25 Jul 2019 09:00:21 +0000 (+0200) Subject: Small cleanup X-Git-Tag: xonotic-v0.8.5~1451 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e382abf54a656e11ca85daf902cef5ef18891666;p=xonotic%2Fxonotic-data.pk3dir.git Small cleanup --- diff --git a/qcsrc/server/weapons/tracing.qc b/qcsrc/server/weapons/tracing.qc index c2d1de11e..74420b333 100644 --- a/qcsrc/server/weapons/tracing.qc +++ b/qcsrc/server/weapons/tracing.qc @@ -281,19 +281,18 @@ void FireRailgunBullet (entity this, .entity weaponentity, vector start, vector if(deathtype == WEP_VAPORIZER.m_id || deathtype == WEP_VORTEX.m_id) // WEAPONTODO { FOREACH_CLIENT(IS_REAL_CLIENT(it) && it != this, { - if(!it.railgunhit) - if(!(IS_SPEC(it) && it.enemy == this)) + if (!it.railgunhit && !(IS_SPEC(it) && it.enemy == this)) { - msg_entity = it; // nearest point on the beam - vector beampos = start + dir * bound(0, (msg_entity.origin - start) * dir, length); + vector beampos = start + dir * bound(0, (it.origin - start) * dir, length); - float f = bound(0, 1 - vlen(beampos - msg_entity.origin) / 512, 1); + float f = bound(0, 1 - vlen(beampos - it.origin) / 512, 1); if(f <= 0) continue; if(!pseudoprojectile) pseudoprojectile = spawn(); // we need this so the sound uses the "entchannel4" volume + msg_entity = it; soundtoat(MSG_ONE, pseudoprojectile, beampos, CH_SHOTS, SND(NEXWHOOSH_RANDOM()), VOL_BASE * f, ATTEN_NONE); } });