From 03aa7fefaf9ffbce23fcf76819fc8daca99b1796 Mon Sep 17 00:00:00 2001
From: Spoike <acceptthis@users.sourceforge.net>
Date: Sat, 11 Jul 2009 18:21:14 +0000
Subject: [PATCH] Fixes a conflict.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3254 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 engine/server/svq3_game.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/engine/server/svq3_game.c b/engine/server/svq3_game.c
index 9195cfbb5..7c91eda2c 100644
--- a/engine/server/svq3_game.c
+++ b/engine/server/svq3_game.c
@@ -2153,16 +2153,17 @@ void SVQ3_WriteSnapshotToClient(client_t *client, sizebuf_t *msg)
 }
 
 
-int clientNum;
-int clientarea;
-qbyte *areabits;
-qbyte		*bitvector;
+static int clientNum;
+static int clientarea;
+static qbyte *areabits;
+static qbyte		*bitvector;
 
 static int VARGS SVQ3_QsortEntityStates( const void *arg1, const void *arg2 )
 {
 	const q3entityState_t *s1 = *(const q3entityState_t **)arg1;
 	const q3entityState_t *s2 = *(const q3entityState_t **)arg2;
 
+
 	if( s1->number > s2->number )
 	{
 		return 1;