Set skill level for Sixup (fixes #2334)

This commit is contained in:
def 2020-06-23 21:33:18 +02:00
parent 339070b8d2
commit a8a2b41f3a
3 changed files with 4 additions and 1 deletions

View file

@ -1972,7 +1972,7 @@ void CServer::CacheServerInfoSixup(CCache *pCache, bool SendClients)
Packer.AddInt(Flags);
int MaxClients = m_NetServer.MaxClients();
Packer.AddInt(0); // server skill level //TODO: Implement this with IGameServer::GetSkillLevel()
Packer.AddInt(g_Config.m_SvSkillLevel); // server skill level
Packer.AddInt(PlayerCount); // num players
Packer.AddInt(maximum(MaxClients - maximum(g_Config.m_SvSpectatorSlots, g_Config.m_SvReservedSlots), PlayerCount)); // max players
Packer.AddInt(ClientCount); // num clients

View file

@ -146,6 +146,7 @@ MACRO_CONFIG_INT(SvDemoChat, sv_demo_chat, 0, 0, 1, CFGFLAG_SERVER, "Record chat
MACRO_CONFIG_INT(SvServerInfoPerSecond, sv_server_info_per_second, 50, 0, 10000, CFGFLAG_SERVER, "Maximum number of complete server info responses that are sent out per second (0 for no limit)")
MACRO_CONFIG_INT(SvVanConnPerSecond, sv_van_conn_per_second, 10, 0, 10000, CFGFLAG_SERVER, "Antispoof specific ratelimit (0 for no limit)")
MACRO_CONFIG_INT(SvSixup, sv_sixup, 1, 0, 1, CFGFLAG_SERVER, "Enable sixup connections")
MACRO_CONFIG_INT(SvSkillLevel, sv_skill_level, 1, SERVERINFO_LEVEL_MIN, SERVERINFO_LEVEL_MAX, CFGFLAG_SERVER, "Difficulty level for Teeworlds 0.7 (0: Casual, 1: Normal, 2: Competitive)")
MACRO_CONFIG_STR(EcBindaddr, ec_bindaddr, 128, "localhost", CFGFLAG_ECON, "Address to bind the external console to. Anything but 'localhost' is dangerous")
MACRO_CONFIG_INT(EcPort, ec_port, 0, 0, 0, CFGFLAG_ECON, "Port to use for the external console")

View file

@ -80,6 +80,8 @@ enum
SERVER_TICK_SPEED=50,
SERVER_FLAG_PASSWORD = 1<<0,
SERVER_FLAG_TIMESCORE = 1<<1,
SERVERINFO_LEVEL_MIN = 0,
SERVERINFO_LEVEL_MAX = 2,
MAX_CLIENTS=64,
VANILLA_MAX_CLIENTS=16,