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/game/g_buildable.c | |
| parent | dc5cc800f856c82f4f8961dd9c1225c3fa4670bc (diff) | |
| parent | 3cc3a553cb8f00f60664189ec8d0e0c92d8344d6 (diff) | |
Merge branch 'v11b'
Diffstat (limited to 'src/game/g_buildable.c')
| -rw-r--r-- | src/game/g_buildable.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c index 8de275e..1c161a6 100644 --- a/src/game/g_buildable.c +++ b/src/game/g_buildable.c @@ -3277,7 +3277,7 @@ void G_BuildableThink( gentity_t *ent, int msec ) ent->dcc = ( ent->buildableTeam != TEAM_HUMANS ) ? 0 : G_FindDCC( ent ); // Set health - ent->s.generic1 = MAX( ent->health, 0 ); + ent->s.constantLight = MAX( ent->health, 0 ); // Set flags ent->s.eFlags &= ~( EF_B_POWERED | EF_B_SPAWNED | EF_B_MARKED ); @@ -4459,7 +4459,7 @@ static gentity_t *G_Build( gentity_t *builder, buildable_t buildable, built->physicsBounce = BG_Buildable( buildable )->bounce; built->s.groundEntityNum = -1; - built->s.generic1 = MAX( built->health, 0 ); + built->s.constantLight = MAX( built->health, 0 ); if( BG_Buildable( buildable )->team == TEAM_ALIENS ) { |