From 4ee9c29e78a84f6f3e80813b124aa045617633e6 Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Fri, 3 Oct 2003 12:05:04 +0000 Subject: * Added disableIn3rdPerson to weapon.cfg to handle alien weapons more elegantly * Muzzle effects are attached to tag_weapon where tag_flash is not available * Handle particle effects properly with cg_drawGun 1 * Fixed some serious bugs in particle system that culled particle systems early --- src/game/g_combat.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src/game/g_combat.c') diff --git a/src/game/g_combat.c b/src/game/g_combat.c index 3d57b5b0..f820b2b0 100644 --- a/src/game/g_combat.c +++ b/src/game/g_combat.c @@ -990,8 +990,17 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker, if( take ) { targ->health = targ->health - take; + + if( targ->s.eType == ET_BUILDABLE ) + { + if( targ->biteam == BIT_ALIENS ) + G_AddEvent( targ, EV_ALIEN_BUILDABLE_DAMAGE, 0 ); + else if( targ->biteam == BIT_HUMANS ) + G_AddEvent( targ, EV_HUMAN_BUILDABLE_DAMAGE, 0 ); + } + if( targ->client ) - targ->client->ps.stats[STAT_HEALTH] = targ->health; + targ->client->ps.stats[ STAT_HEALTH ] = targ->health; //TA: add to the attackers "account" on the target if( targ->client && attacker->client && -- cgit