From d63b9341c9888b2e7b6316bf98abdc76665d1e7f Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Sun, 8 Jan 2017 16:42:26 +0100 Subject: [PATCH] Updated some other silly thing I should have noticed. --- Source/Server/TraceAttack.c | 2 +- Source/Shared/BaseMelee.c | 4 +++- Source/Shared/Effects.c | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/Server/TraceAttack.c b/Source/Server/TraceAttack.c index 4f7bbf25..5f31d256 100644 --- a/Source/Server/TraceAttack.c +++ b/Source/Server/TraceAttack.c @@ -75,7 +75,7 @@ void TraceAttack_FireBullets( int iShots, vector vPos ) { vector vDir; makevectors(self.v_angle); - while ( iShots > 0) { + while ( iShots > 0 ) { iTotalPenetrations = 0; vDir = aim( self, 100000 ) + Math_CRandom()*self.fAccuracy*v_right + Math_CRandom()*self.fAccuracy*v_up; TraceAttack_FireSingle( vPos, vDir ); diff --git a/Source/Shared/BaseMelee.c b/Source/Shared/BaseMelee.c index 83d1f75f..c3121daa 100644 --- a/Source/Shared/BaseMelee.c +++ b/Source/Shared/BaseMelee.c @@ -34,14 +34,16 @@ int BaseMelee_Attack( void ) { vSource = ( self.origin + self.view_ofs ); traceline( vSource, vSource + ( v_forward * 64 ), MOVE_HITMODEL, self ); - if ( trace_fraction == 1.0 ) + if ( trace_fraction == 1.0 ) { return FALSE; + } vOrigin = trace_endpos - v_forward * 2; if ( trace_ent.takedamage ) { if ( trace_ent.iBleeds == TRUE ) { Effect_Impact( IMPACT_FLESH, trace_endpos, trace_plane_normal ); + sound( self, CHAN_WEAPON, sprintf( "weapons/knife_hit%d.wav", floor( ( random() * 4 ) + 1 ) ), 1, ATTN_NORM ); } Damage_Apply( trace_ent, self, wptTable[ self.weapon ].iDamage, trace_endpos ); } else { diff --git a/Source/Shared/Effects.c b/Source/Shared/Effects.c index fc4337a3..5e61a9a6 100644 --- a/Source/Shared/Effects.c +++ b/Source/Shared/Effects.c @@ -95,7 +95,6 @@ void Effect_Impact( int iType, vector vPos, vector vNormal ) { pointsound( vPos, sprintf( "weapons/ric_metal-%d.wav", floor( ( random() * 2 ) + 1 ) ), 1, ATTN_STATIC ); break; case IMPACT_FLESH: - pointsound( vPos, sprintf( "weapons/knife_hit%d.wav", floor( ( random() * 4 ) + 1 ) ), 1, ATTN_STATIC ); break; default: pointsound( vPos, sprintf( "weapons/ric%d.wav", floor( ( random() * 5 ) + 1 ) ), 1, ATTN_STATIC );