From 7d8b751afdbf730c6b694cc7d23bbe2689dbdaa4 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zturtleman@gmail.com>
Date: Mon, 6 Feb 2012 21:28:40 +0000
Subject: [PATCH] Patches by symlink.

#5313 - EF_CONNECTION set on wrong eFlags
#5314 - snc drawn in nirvana instead at lagometer
---
 code/cgame/cg_draw.c | 2 +-
 code/game/g_active.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/cgame/cg_draw.c b/code/cgame/cg_draw.c
index 96660831..aa22657a 100644
--- a/code/cgame/cg_draw.c
+++ b/code/cgame/cg_draw.c
@@ -1723,7 +1723,7 @@ static void CG_DrawLagometer( void ) {
 	trap_R_SetColor( NULL );
 
 	if ( cg_nopredict.integer || cg_synchronousClients.integer ) {
-		CG_DrawBigString( ax, ay, "snc", 1.0 );
+		CG_DrawBigString( x, y, "snc", 1.0 );
 	}
 
 	CG_DrawDisconnect();
diff --git a/code/game/g_active.c b/code/game/g_active.c
index df56efd8..93ff7147 100644
--- a/code/game/g_active.c
+++ b/code/game/g_active.c
@@ -1151,9 +1151,9 @@ void ClientEndFrame( gentity_t *ent ) {
 
 	// add the EF_CONNECTION flag if we haven't gotten commands recently
 	if ( level.time - ent->client->lastCmdTime > 1000 ) {
-		ent->s.eFlags |= EF_CONNECTION;
+		ent->client->ps.eFlags |= EF_CONNECTION;
 	} else {
-		ent->s.eFlags &= ~EF_CONNECTION;
+		ent->client->ps.eFlags &= ~EF_CONNECTION;
 	}
 
 	ent->client->ps.stats[STAT_HEALTH] = ent->health;	// FIXME: get rid of ent->health...