Commit 568e0e9e authored by Artem Golubikhin's avatar Artem Golubikhin

Merge branch 'deprecated-code-removal' into 'general'

Deprecated code removal: removed -nomaster launch parameter

See merge request !3
parents d1eadadd ecc0c19b
......@@ -37,7 +37,6 @@ double host_frametime;
int host_framecount;
//int minimum_memory;
client_t *host_client;
qboolean gfNoMasterServer;
//qboolean g_bUsingInGameAdvertisements;
double oldrealtime;
int host_hunklevel;
......
......@@ -71,7 +71,6 @@ extern qboolean host_initialized;
extern double host_frametime;
extern int host_framecount;
extern client_t *host_client;
extern qboolean gfNoMasterServer;
extern double oldrealtime;
extern int host_hunklevel;
extern jmp_buf host_abortserver;
......
......@@ -303,28 +303,17 @@ void CSteam3Server::Activate()
CRehldsPlatformHolder::get()->SteamGameServer()->LogOnAnonymous();
m_bLogOnResult = false;
if (COM_CheckParm("-nomaster"))
{
Con_Printf("Master server communication disabled.\n");
gfNoMasterServer = TRUE;
}
else
{
if (!gfNoMasterServer && g_psvs.maxclients > 1)
{
CRehldsPlatformHolder::get()->SteamGameServer()->EnableHeartbeats(true);
double fMasterHeartbeatTimeout = 200.0;
if (!Q_strcmp(gamedir, "dmc"))
fMasterHeartbeatTimeout = 150.0;
if (!Q_strcmp(gamedir, "tfc"))
fMasterHeartbeatTimeout = 400.0;
if (!Q_strcmp(gamedir, "cstrike"))
fMasterHeartbeatTimeout = 400.0;
CRehldsPlatformHolder::get()->SteamGameServer()->SetHeartbeatInterval((int)fMasterHeartbeatTimeout);
CSteam3Server::NotifyOfLevelChange(true);
}
}
CRehldsPlatformHolder::get()->SteamGameServer()->EnableHeartbeats(true);
double fMasterHeartbeatTimeout = 200.0;
if (!Q_strcmp(gamedir, "dmc"))
fMasterHeartbeatTimeout = 150.0;
if (!Q_strcmp(gamedir, "tfc"))
fMasterHeartbeatTimeout = 400.0;
if (!Q_strcmp(gamedir, "cstrike"))
fMasterHeartbeatTimeout = 400.0;
CRehldsPlatformHolder::get()->SteamGameServer()->SetHeartbeatInterval((int)fMasterHeartbeatTimeout);
CSteam3Server::NotifyOfLevelChange(true);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment