team-fte
/
fteqw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes a conflict. 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3254 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2009-07-11 18:21:14 +00:00
parent 0cf09d8063
commit 03aa7fefaf
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engine/server/svq3_game.c
View File

@ -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;