From b8696658e67bf459c1e2538e8f1b6a6297143adc Mon Sep 17 00:00:00 2001
From: Roman Tetelman <kevlarman@gmail.com>
Date: Sat, 3 Oct 2009 12:10:33 +0000
Subject: * fix for unlagged being turned off for clients who spawn (bob) * fix
 ui_messagemode2

---
 src/game/g_active.c | 4 ++--
 src/game/g_client.c | 4 ++--
 src/game/g_local.h  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/game/g_active.c b/src/game/g_active.c
index 84bdd7d9..921d2388 100644
--- a/src/game/g_active.c
+++ b/src/game/g_active.c
@@ -1171,7 +1171,7 @@ void G_UnlaggedOn( gentity_t *attacker, vec3_t muzzle, float range )
   if( !g_unlagged.integer )
     return;
 
-  if( !attacker->client->useUnlagged )
+  if( !attacker->client->pers.useUnlagged )
     return;
 
   for( i = 0; i < level.maxclients; i++ )
@@ -1242,7 +1242,7 @@ static void G_UnlaggedDetectCollisions( gentity_t *ent )
   if( !g_unlagged.integer )
     return;
 
-  if( !ent->client->useUnlagged )
+  if( !ent->client->pers.useUnlagged )
     return;
 
   calc = &ent->client->unlaggedCalc;
diff --git a/src/game/g_client.c b/src/game/g_client.c
index a285f6cc..782f053e 100644
--- a/src/game/g_client.c
+++ b/src/game/g_client.c
@@ -1129,9 +1129,9 @@ void ClientUserinfoChanged( int clientNum )
   
   s = Info_ValueForKey( userinfo, "cg_unlagged" );
   if( !s[0] || atoi( s ) != 0 )
-    client->useUnlagged = qtrue;
+    client->pers.useUnlagged = qtrue;
   else
-    client->useUnlagged = qfalse;
+    client->pers.useUnlagged = qfalse;
 
   // colors
   strcpy( c1, Info_ValueForKey( userinfo, "color1" ) );
diff --git a/src/game/g_local.h b/src/game/g_local.h
index a70a02e5..96031ec6 100644
--- a/src/game/g_local.h
+++ b/src/game/g_local.h
@@ -339,6 +339,7 @@ typedef struct
   qboolean            denyBuild;
   int                 adminLevel;
   char                voice[ MAX_VOICE_NAME_LEN ];
+  qboolean            useUnlagged;  
 } clientPersistant_t;
 
 #define MAX_UNLAGGED_MARKERS 10
@@ -435,7 +436,6 @@ struct gclient_s
   unlagged_t          unlaggedBackup;
   unlagged_t          unlaggedCalc;
   int                 unlaggedTime;
-  qboolean            useUnlagged;  
  
   float               voiceEnthusiasm;
   char                lastVoiceCmd[ MAX_VOICE_CMD_LEN ];
-- 
cgit