diff --git a/src/engine/shared/config_variables.h b/src/engine/shared/config_variables.h index fb87d5bcd..6b7924aac 100644 --- a/src/engine/shared/config_variables.h +++ b/src/engine/shared/config_variables.h @@ -247,7 +247,6 @@ MACRO_CONFIG_STR(SvRulesLine10, sv_rules_line10, 128, "", CFGFLAG_SERVER, "Rules MACRO_CONFIG_INT(SvTeam, sv_team, 1, 0, 3, CFGFLAG_SERVER|CFGFLAG_GAME, "Teams configuration (0 = off, 1 = on but optional, 2 = must play only with teams, 3 = forced random team only for you)") MACRO_CONFIG_INT(SvTeamMaxSize, sv_max_team_size, MAX_CLIENTS, 1, MAX_CLIENTS, CFGFLAG_SERVER|CFGFLAG_GAME, "Maximum team size (from 2 to 64)") -MACRO_CONFIG_INT(SvTeamLock, sv_team_lock, 1, 0, 1, CFGFLAG_SERVER|CFGFLAG_GAME, "Enable team lock") MACRO_CONFIG_INT(SvMapVote, sv_map_vote, 1, 0, 1, CFGFLAG_SERVER, "Whether to allow /map") MACRO_CONFIG_STR(SvAnnouncementFileName, sv_announcement_filename, 24, "announcement.txt", CFGFLAG_SERVER, "file which will have the announcement, each one at a line") diff --git a/src/game/server/ddracechat.cpp b/src/game/server/ddracechat.cpp index 667b3147b..f29e08e13 100644 --- a/src/game/server/ddracechat.cpp +++ b/src/game/server/ddracechat.cpp @@ -781,13 +781,6 @@ void CGameContext::ConLockTeam(IConsole::IResult *pResult, void *pUserData) { pSelf->UnlockTeam(pResult->m_ClientID, Team); } - else if(!g_Config.m_SvTeamLock) - { - pSelf->Console()->Print( - IConsole::OUTPUT_LEVEL_STANDARD, - "print", - "Team locking is disabled on this server"); - } else { ((CGameControllerDDRace*) pSelf->m_pController)->m_Teams.SetTeamLock(Team, true);