diff options
| -rw-r--r-- | src/cgame/cg_servercmds.c | 3 | ||||
| -rw-r--r-- | src/game/g_cmds.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/cgame/cg_servercmds.c b/src/cgame/cg_servercmds.c index faa5a175..db1b2262 100644 --- a/src/cgame/cg_servercmds.c +++ b/src/cgame/cg_servercmds.c @@ -543,7 +543,8 @@ void CG_Menu( int menu, int arg ) break; case MN_CMD_CHEAT_TEAM: - shortMsg = "You may not use this command while on a team"; + shortMsg = "Cheats are not enabled on this server, so " + "you may not use this command while on a team"; type = DT_COMMAND; break; diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c index 4a3a1822..caa73ccd 100644 --- a/src/game/g_cmds.c +++ b/src/game/g_cmds.c @@ -2930,8 +2930,7 @@ void ClientCommand( int clientNum ) G_FloodLimited( ent ) ) ) return; - if( ( command->cmdFlags & CMD_TEAM || - ( command->cmdFlags & CMD_CHEAT_TEAM && !g_cheats.integer ) ) && + if( command->cmdFlags & CMD_TEAM && ent->client->pers.teamSelection == TEAM_NONE ) { G_TriggerMenu( clientNum, MN_CMD_TEAM ); |