[quake3-commits] r2219 - in trunk/code: cgame game

[DONOTREPLY at icculus.org]

Author: ztm
Date: 2012-02-06 16:28:40 -0500 (Mon, 06 Feb 2012)
New Revision: 2219

Modified:
   trunk/code/cgame/cg_draw.c
   trunk/code/game/g_active.c
Log:
Patches by symlink.

#5313 - EF_CONNECTION set on wrong eFlags
#5314 - snc drawn in nirvana instead at lagometer

Modified: trunk/code/cgame/cg_draw.c
===================================================================
--- trunk/code/cgame/cg_draw.c	2012-02-06 21:05:57 UTC (rev 2218)
+++ trunk/code/cgame/cg_draw.c	2012-02-06 21:28:40 UTC (rev 2219)
@@ -1723,7 +1723,7 @@
 	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();

Modified: trunk/code/game/g_active.c
===================================================================
--- trunk/code/game/g_active.c	2012-02-06 21:05:57 UTC (rev 2218)
+++ trunk/code/game/g_active.c	2012-02-06 21:28:40 UTC (rev 2219)
@@ -1151,9 +1151,9 @@
 
 	// 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...