summaryrefslogtreecommitdiff
path: root/src/game/g_combat.c
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2005-06-29 23:35:55 +0000
committerTim Angus <tim@ngus.net>2005-06-29 23:35:55 +0000
commit7c13523d9b02f1319dec7dd0dece68f96f17ed35 (patch)
treecbcfcc603bc34f8352a9a9bf021a5393ccf63821 /src/game/g_combat.c
parent0e56723b5c2e42c67bb12eca353caccc7a1a3886 (diff)
* Fixed a bug where menus would appear during demo playback
* Fixed a bug where delayed suicide would persist over death * Reduced turret health and damage, increased range * Generally strengthened alien buildable health and regen a little * Increased damage that hives do * Unlocked the trapper at stage 1 * Lev0 alien can now damage human defensive structures * Booster now doubles alien regeneration rate * Updated dependancies
Diffstat (limited to 'src/game/g_combat.c')
-rw-r--r--src/game/g_combat.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/game/g_combat.c b/src/game/g_combat.c
index e923c1ee..0bf8b1b8 100644
--- a/src/game/g_combat.c
+++ b/src/game/g_combat.c
@@ -164,6 +164,7 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
return;
self->client->ps.pm_type = PM_DEAD;
+ self->suicideTime = 0;
if( attacker )
{