From 7eb5f4397d5369e35740c67df664b46069e08ae2 Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Tue, 15 Jan 2013 22:05:03 +0000
Subject: Remove a bunch of LEGACY_PROTOCOL blocks

---
 src/server/sv_client.c | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

(limited to 'src/server/sv_client.c')

diff --git a/src/server/sv_client.c b/src/server/sv_client.c
index 88231d16..247a1807 100644
--- a/src/server/sv_client.c
+++ b/src/server/sv_client.c
@@ -65,13 +65,7 @@ void SV_GetChallenge(netadr_t from)
 
 	gameName = Cmd_Argv(2);
 
-#ifdef LEGACY_PROTOCOL
-	// gamename is optional for legacy protocol
-	if (com_legacyprotocol->integer && !*gameName)
-		gameMismatch = qfalse;
-	else
-#endif
-		gameMismatch = !*gameName || strcmp(gameName, com_gamename->string) != 0;
+	gameMismatch = !*gameName || strcmp(gameName, com_gamename->string) != 0;
 
 	// reject client if the gamename string sent by the client doesn't match ours
 	if (gameMismatch)
@@ -1192,15 +1186,8 @@ void SV_UserinfoChanged( client_t *cl ) {
 	}
 	
 #ifdef USE_VOIP
-#ifdef LEGACY_PROTOCOL
-	if(cl->compat)
-		cl->hasVoip = qfalse;
-	else
-#endif
-	{
-		val = Info_ValueForKey(cl->userinfo, "cl_voip");
-		cl->hasVoip = atoi(val);
-	}
+	val = Info_ValueForKey(cl->userinfo, "cl_voip");
+	cl->hasVoip = atoi(val);
 #endif
 
 	// TTimo
-- 
cgit