diff options
| author | Tim Angus <tim@ngus.net> | 2007-12-01 01:26:32 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2007-12-01 01:26:32 +0000 |
| commit | 3ffe4805cfebd93a60bf59b582303540b2ec0d80 (patch) | |
| tree | feb55d64b47f4ca007bb671874adcfc1c45c072e | |
| parent | eef39a673717b450cf2ef5537066472ec556c21f (diff) | |
* (bug 3451) Widen name column in scoreboard (thebenmachine)
* (bug 3452) Cancel suicides when entering hovel (thebenmachine)
| -rw-r--r-- | src/game/g_buildable.c | 3 | ||||
| -rw-r--r-- | ui/teamscore.menu | 4 |
2 files changed, 5 insertions, 2 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; diff --git a/ui/teamscore.menu b/ui/teamscore.menu index 635027a5..a2c76236 100644 --- a/ui/teamscore.menu +++ b/ui/teamscore.menu @@ -278,7 +278,7 @@ 5 15 ALIGN_LEFT 21 15 ALIGN_LEFT 7 30 ALIGN_LEFT - 45 ((W/2)-200) ALIGN_LEFT + 45 ((W/2)-170) ALIGN_LEFT ((W/2)-120) 20 ALIGN_RIGHT ((W/2)-80) 20 ALIGN_RIGHT ((W/2)-40) 20 ALIGN_RIGHT @@ -307,7 +307,7 @@ 5 15 ALIGN_LEFT 21 15 ALIGN_LEFT 7 30 ALIGN_LEFT - 45 ((W/2)-200) ALIGN_LEFT + 45 ((W/2)-170) ALIGN_LEFT ((W/2)-120) 20 ALIGN_RIGHT ((W/2)-80) 20 ALIGN_RIGHT ((W/2)-40) 20 ALIGN_RIGHT |