From 3760bbf494409d11bc9e0cdba9486f519e4fa2e0 Mon Sep 17 00:00:00 2001 From: sezero Date: Tue, 27 Dec 2011 08:27:52 +0000 Subject: [PATCH] reverted revision 536 which made coop and deathmatch not to be set at the same time git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@555 af15c1b1-3010-417e-b628-4374ebc0bcbd --- Quake/host.c | 17 ++--------------- Quake/net_main.c | 10 +--------- 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/Quake/host.c b/Quake/host.c index a59c171e..aa4ce42c 100644 --- a/Quake/host.c +++ b/Quake/host.c @@ -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); diff --git a/Quake/net_main.c b/Quake/net_main.c index 247391c2..00ee3776 100644 --- a/Quake/net_main.c +++ b/Quake/net_main.c @@ -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"); }