diff options
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/g_active.c | 3 | ||||
| -rw-r--r-- | src/game/g_buildable.c | 5 | ||||
| -rw-r--r-- | src/game/g_cmds.c | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/game/g_active.c b/src/game/g_active.c index aeb69cd5..0bbe5c82 100644 --- a/src/game/g_active.c +++ b/src/game/g_active.c @@ -1140,7 +1140,8 @@ void ClientThink_real( gentity_t *ent ) client->buttons = ucmd->buttons; client->latched_buttons |= client->buttons & ~client->oldbuttons; - if( ( client->buttons & BUTTON_GETFLAG ) && !( client->oldbuttons & BUTTON_GETFLAG ) ) + if( ( client->buttons & BUTTON_GETFLAG ) && !( client->oldbuttons & BUTTON_GETFLAG ) && + client->ps.stats[ STAT_HEALTH ] > 0 ) { trace_t trace; vec3_t view, point; diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c index c35e64ec..3ff4da9a 100644 --- a/src/game/g_buildable.c +++ b/src/game/g_buildable.c @@ -1068,8 +1068,9 @@ void AHovel_Use( gentity_t *self, gentity_t *other, gentity_t *activator ) //this hovel is in use G_TriggerMenu( activator->client->ps.clientNum, MN_A_HOVEL_OCCUPIED ); } - else if( ( activator->client->ps.stats[ STAT_PCLASS ] == PCL_A_B_BASE ) || - ( activator->client->ps.stats[ STAT_PCLASS ] == PCL_A_B_LEV1 ) ) + else if( ( ( activator->client->ps.stats[ STAT_PCLASS ] == PCL_A_B_BASE ) || + ( activator->client->ps.stats[ STAT_PCLASS ] == PCL_A_B_LEV1 ) ) && + activator->health > 0 ) { if( AHovel_Blocked( self, activator, qfalse ) ) { diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c index 3a98c468..b24b8526 100644 --- a/src/game/g_cmds.c +++ b/src/game/g_cmds.c @@ -499,8 +499,10 @@ void Cmd_Team_f( gentity_t *ent ) G_ChangeTeam( ent, team ); - if( team == PTE_ALIENS || team == PTE_HUMANS ) - trap_SendServerCommand( -1, va( "print \"%s joined the %s.\n\"", ent->client->pers.netname, s ) ); + if( team == PTE_ALIENS ) + trap_SendServerCommand( -1, va( "print \"%s joined the aliens.\n\"", ent->client->pers.netname ) ); + else if( team == PTE_HUMANS ) + trap_SendServerCommand( -1, va( "print \"%s joined the humans.\n\"", ent->client->pers.netname ) ); } |