From aede0859509b743e8a76c2ad055ae94d0545af88 Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Sun, 4 Oct 2009 22:40:52 +0000
Subject: * Reduce generic1 to 10 bits * Remove buildable health
 scaling/masking stuff; 10 bits is plenty now * Potentially fix bug where many
 PVS entering buildables would inappropriately   make damaged sounds

---
 src/cgame/cg_tutorial.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/cgame/cg_tutorial.c')

diff --git a/src/cgame/cg_tutorial.c b/src/cgame/cg_tutorial.c
index 8db27d23..75bca690 100644
--- a/src/cgame/cg_tutorial.c
+++ b/src/cgame/cg_tutorial.c
@@ -156,8 +156,8 @@ static entityState_t *CG_BuildableInRange( playerState_t *ps, float *healthFract
 
   if( healthFraction )
   {
-    health = es->generic1 & B_HEALTH_MASK;
-    *healthFraction = (float)health / B_HEALTH_MASK;
+    health = es->generic1;
+    *healthFraction = (float)health / BG_Buildable( es->modelindex )->health;
   }
 
   if( es->eType == ET_BUILDABLE &&
-- 
cgit