diff options
author | Paweł Redman <pawel.redman@gmail.com> | 2015-12-05 21:05:10 +0100 |
---|---|---|
committer | Paweł Redman <pawel.redman@gmail.com> | 2015-12-05 21:05:10 +0100 |
commit | 21c41b7b5584e35edea66f66832a980363a95443 (patch) | |
tree | 95b1f5c6df096ad1f25af7b9ea8062f2915f07c6 /src/cgame/cg_buildable.c | |
parent | dc5cc800f856c82f4f8961dd9c1225c3fa4670bc (diff) | |
parent | 3cc3a553cb8f00f60664189ec8d0e0c92d8344d6 (diff) |
Merge branch 'v11b'
Diffstat (limited to 'src/cgame/cg_buildable.c')
-rw-r--r-- | src/cgame/cg_buildable.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cgame/cg_buildable.c b/src/cgame/cg_buildable.c index 5b2582c..e2e33f8 100644 --- a/src/cgame/cg_buildable.c +++ b/src/cgame/cg_buildable.c @@ -709,7 +709,7 @@ static void CG_BuildableParticleEffects( centity_t *cent ) { entityState_t *es = ¢->currentState; team_t team = BG_Buildable( es->modelindex )->team; - int health = es->generic1; + int health = es->constantLight; float healthFrac = (float)health / BG_Buildable( es->modelindex )->health; if( !( es->eFlags & EF_B_SPAWNED ) ) @@ -1055,7 +1055,7 @@ static void CG_BuildableStatusDisplay( centity_t *cent ) return; } - health = es->generic1; + health = es->constantLight; healthScale = (float)health / BG_Buildable( es->modelindex )->health; if( health > 0 && healthScale < 0.01f ) @@ -1535,7 +1535,7 @@ void CG_Buildable( centity_t *cent ) trap_S_AddLoopingSound( es->number, cent->lerpOrigin, vec3_origin, weapon->readySound ); } - health = es->generic1; + health = es->constantLight; if( health < cent->lastBuildableHealth && ( es->eFlags & EF_B_SPAWNED ) ) |