diff options
| author | Tim Angus <tim@ngus.net> | 2004-01-22 03:44:29 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2004-01-22 03:44:29 +0000 |
| commit | 7dcfcac2a6de7e2976990b8620f660ad7af959a9 (patch) | |
| tree | 6f198359eb207bf6a25ab6bf3c53ad76fe071673 /src/game | |
| parent | 8a7b1a7098224a0b3c36a3c2173f47ee22d4f583 (diff) | |
* Particle system should complain less if it can't find a specific system
* Reduced size of misc_particle_system entity in entities.def
* Added prebuild sounds for the buildables
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/g_weapon.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game/g_weapon.c b/src/game/g_weapon.c index d036c0f5..dc2c6b38 100644 --- a/src/game/g_weapon.c +++ b/src/game/g_weapon.c @@ -84,13 +84,13 @@ void meleeAttack( gentity_t *ent, float range, int damage, meansOfDeath_t mod ) VectorMA( muzzle, range, forward, end ); trap_Trace( &tr, muzzle, NULL, NULL, end, ent->s.number, MASK_SHOT ); - if ( tr.surfaceFlags & SURF_NOIMPACT ) + if( tr.surfaceFlags & SURF_NOIMPACT ) return; traceEnt = &g_entities[ tr.entityNum ]; // send blood impact - if ( traceEnt->takedamage && traceEnt->client ) + if( traceEnt->takedamage && traceEnt->client ) { tent = G_TempEntity( tr.endpos, EV_MISSILE_HIT ); tent->s.otherEntityNum = traceEnt->s.number; @@ -99,7 +99,7 @@ void meleeAttack( gentity_t *ent, float range, int damage, meansOfDeath_t mod ) tent->s.generic1 = ent->s.generic1; //weaponMode } - if ( traceEnt->takedamage ) + if( traceEnt->takedamage ) G_Damage( traceEnt, ent, ent, forward, tr.endpos, damage, DAMAGE_NO_KNOCKBACK, mod ); } |