diff options
Diffstat (limited to 'src/game/g_cmds.c')
| -rw-r--r-- | src/game/g_cmds.c | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c index fb59950..0429d31 100644 --- a/src/game/g_cmds.c +++ b/src/game/g_cmds.c @@ -775,16 +775,6 @@ void Cmd_Team_f( gentity_t *ent ) if( level.time - ent->client->pers.teamChangeTime < 1000 ) return; - if( ent->client->pers.teamSelection != PTE_NONE ) - { - int cs_offset; - - if( ent->client->pers.teamSelection == PTE_ALIENS ) - cs_offset = 1; - else - cs_offset = 0; - } - // Prevent invisible players from joining a team if( ent->client->sess.invisible == qtrue ) { @@ -2701,11 +2691,12 @@ void Cmd_CallTeamVote_f( gentity_t *ent ) if( G_admin_permission( &g_entities[ clientNum ], ADMF_IMMUNITY ) ) { char reasonprint[ MAX_STRING_CHARS ] = ""; + if( reason[ 0 ] != '\0' ) - Com_sprintf(reasonprint, sizeof(reasonprint), "With reason: %s", reason); + Com_sprintf(reasonprint, sizeof(reasonprint), "With reason: %s", reason); - Com_sprintf( message, sizeof( message ), "%s^7 attempted /callteamvote %s %s on immune admin %s^7 %s^7", - ent->client->pers.netname, arg1, arg2, g_entities[ clientNum ].client->pers.netname, reasonprint ); + Com_sprintf( message, sizeof( message ), "%s^7 attempted /callteamvote %s %s on immune admin %s^7 %s^7", + ent->client->pers.netname, arg1, arg2, g_entities[ clientNum ].client->pers.netname, reasonprint ); } } else @@ -5337,12 +5328,12 @@ static void Cmd_Ignore_f( gentity_t *ent ) return; } - if( g_floodMinTime.integer ) - if ( G_Flood_Limited( ent ) ) - { - trap_SendServerCommand( ent-g_entities, "print \"Your chat is flood-limited; wait before chatting again\n\"" ); - return; - } + if( g_floodMinTime.integer ) + if ( G_Flood_Limited( ent ) ) + { + trap_SendServerCommand( ent-g_entities, "print \"Your chat is flood-limited; wait before chatting again\n\"" ); + return; + } if( ent->client->pers.teamSelection == PTE_ALIENS ) |