rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-11 15:52:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Restored Q3A code for movers with health

Browse source
This commit is contained in:
Andrei Drexler 2002-05-15 17:13:22 +00:00
parent 6d23fc5683
commit 004c622ee6
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
reaction/game/g_combat.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.75 2002/05/15 17:13:22 makro
// Restored Q3A code for movers with health
//
// Revision 1.74 2002/05/15 13:58:35 makro
// Health for movers
//
@ -1894,10 +1897,20 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker,
attacker = &g_entities[ENTITYNUM_WORLD];
}
/* old code
if (targ->s.eType == ET_MOVER && targ->health <= 0) {
//Makro - added
if (targ->use) targ->use(targ, inflictor, attacker);
return;
}*/
// Makro - pasted back from the original code
// shootable doors / buttons don't actually have any health
if ( targ->s.eType == ET_MOVER ) {
if ( targ->use && targ->moverState == MOVER_POS1 ) {
targ->use( targ, inflictor, attacker );
}
return;
}
//Elder: from action source