From 9439ae4c9e0d2258c77d9f1f661bbe030ed15c53 Mon Sep 17 00:00:00 2001
From: /dev/humancontroller <devhc@example.com>
Date: Sun, 13 Jul 2014 21:04:55 +0200
Subject: use entityState_t::misc instead of entityState_t::generic1 in some
 rather important cases involving 1.1 clients

---
 src/cgame/cg_buildable.c | 6 +++---
 src/cgame/cg_ents.c      | 2 +-
 src/cgame/cg_event.c     | 2 +-
 src/cgame/cg_tutorial.c  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/cgame')

diff --git a/src/cgame/cg_buildable.c b/src/cgame/cg_buildable.c
index 256f9816..534aa677 100644
--- a/src/cgame/cg_buildable.c
+++ b/src/cgame/cg_buildable.c
@@ -724,7 +724,7 @@ static void CG_BuildableParticleEffects( centity_t *cent )
 {
   entityState_t   *es = &cent->currentState;
   team_t          team = BG_Buildable( es->modelindex )->team;
-  int             health = es->generic1;
+  int             health = es->misc;
   float           healthFrac = (float)health / BG_Buildable( es->modelindex )->health;
 
   if( !( es->eFlags & EF_B_SPAWNED ) )
@@ -1045,7 +1045,7 @@ static void CG_BuildableStatusDisplay( centity_t *cent )
       return;
   }
 
-  health = es->generic1;
+  health = es->misc;
   healthScale = (float)health / BG_Buildable( es->modelindex )->health;
 
   if( health > 0 && healthScale < 0.01f )
@@ -1512,7 +1512,7 @@ void CG_Buildable( centity_t *cent )
       trap_S_AddLoopingSound( es->number, cent->lerpOrigin, vec3_origin, weapon->readySound );
   }
 
-  health = es->generic1;
+  health = es->misc;
 
   if( health < cent->lastBuildableHealth &&
       ( es->eFlags & EF_B_SPAWNED ) )
diff --git a/src/cgame/cg_ents.c b/src/cgame/cg_ents.c
index fe755d4f..39147153 100644
--- a/src/cgame/cg_ents.c
+++ b/src/cgame/cg_ents.c
@@ -1019,7 +1019,7 @@ static void CG_CEntityPVSEnter( centity_t *cent )
       break;
 
     case ET_BUILDABLE:
-      cent->lastBuildableHealth = es->generic1;
+      cent->lastBuildableHealth = es->misc;
       break;
   }
 
diff --git a/src/cgame/cg_event.c b/src/cgame/cg_event.c
index 2401d04e..e646d28c 100644
--- a/src/cgame/cg_event.c
+++ b/src/cgame/cg_event.c
@@ -795,7 +795,7 @@ void CG_EntityEvent( centity_t *cent, vec3_t position )
     case EV_TESLATRAIL:
       cent->currentState.weapon = WP_TESLAGEN;
       {
-        centity_t *source = &cg_entities[ es->generic1 ];
+        centity_t *source = &cg_entities[ es->misc ];
         centity_t *target = &cg_entities[ es->clientNum ];
         vec3_t    sourceOffset = { 0.0f, 0.0f, 28.0f };
 
diff --git a/src/cgame/cg_tutorial.c b/src/cgame/cg_tutorial.c
index daa0b262..9bcac252 100644
--- a/src/cgame/cg_tutorial.c
+++ b/src/cgame/cg_tutorial.c
@@ -157,7 +157,7 @@ static entityState_t *CG_BuildableInRange( playerState_t *ps, float *healthFract
 
   if( healthFraction )
   {
-    health = es->generic1;
+    health = es->misc;
     *healthFraction = (float)health / BG_Buildable( es->modelindex )->health;
   }
 
-- 
cgit