summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2007-12-01 01:26:32 +0000
committerTim Angus <tim@ngus.net>2007-12-01 01:26:32 +0000
commit3ffe4805cfebd93a60bf59b582303540b2ec0d80 (patch)
treefeb55d64b47f4ca007bb671874adcfc1c45c072e /src
parenteef39a673717b450cf2ef5537066472ec556c21f (diff)
* (bug 3451) Widen name column in scoreboard (thebenmachine)
* (bug 3452) Cancel suicides when entering hovel (thebenmachine)
Diffstat (limited to 'src')
-rw-r--r--src/game/g_buildable.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c
index b64e663c..c56dec3c 100644
--- a/src/game/g_buildable.c
+++ b/src/game/g_buildable.c
@@ -1246,6 +1246,9 @@ void AHovel_Use( gentity_t *self, gentity_t *other, gentity_t *activator )
activator->client->ps.eFlags |= EF_NODRAW;
G_UnlaggedClear( activator );
+ // Cancel pending suicides
+ activator->suicideTime = 0;
+
activator->client->ps.stats[ STAT_STATE ] |= SS_HOVELING;
activator->client->hovel = self;
self->builder = activator;