fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2024-11-14 17:10:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

reverted revision 536 which made coop and deathmatch not to be set at

Browse source 
the same time

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@555 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
sezero 2011-12-27 08:27:52 +00:00
parent 8494877f84
commit 3f60e1deb9
2 changed files with 3 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
quakespasm/Quake/host.c
View file

@ -105,19 +105,6 @@ static void Max_Edicts_f (cvar_t *var)
oldval = max_edicts.value;
}
// 1999-09-06 deathmatch/coop not at the same time fix by Maddes
static void Callback_Deathmatch (cvar_t *var)
{
if (var->value)
Cvar_Set ("coop", "0");
}
static void Callback_Coop (cvar_t *var)
{
if (var->value)
Cvar_Set ("deathmatch", "0");
}
/*
================
Host_EndGame
@ -274,8 +261,8 @@ void Host_InitLocal (void)
Cvar_RegisterVariable (&noexit, NULL);
Cvar_RegisterVariable (&skill, NULL);
Cvar_RegisterVariable (&developer, NULL);
Cvar_RegisterVariable (&coop, Callback_Coop);
Cvar_RegisterVariable (&deathmatch, Callback_Deathmatch);
Cvar_RegisterVariable (&coop, NULL);
Cvar_RegisterVariable (&deathmatch, NULL);
Cvar_RegisterVariable (&pausable, NULL);

10
quakespasm/Quake/net_main.c
View file

@ -208,17 +208,9 @@ static void MaxPlayers_f (void)
svs.maxclients = n;
if (n == 1)
{
Cvar_Set ("deathmatch", "0");
Cvar_Set ("coop", "0");
}
else
{
if (coop.value)
Cvar_Set ("deathmatch", "0");
else
Cvar_Set ("deathmatch", "1");
}
Cvar_Set ("deathmatch", "1");
}