summaryrefslogtreecommitdiff
path: root/src/game/g_combat.c
diff options
context:
space:
mode:
authorenneract <trem.redman@gmail.com>2015-01-08 00:42:15 +0100
committerenneract <trem.redman@gmail.com>2015-01-08 00:42:15 +0100
commit96bede71e66823dc28a57935e48e4cc7b17f55af (patch)
tree26dbd475a40bdf1d3412d5a7d5c9ad23a16c8bd5 /src/game/g_combat.c
parent96f8e06ec9aa117bb8dd7e8d671d93e3884cb98f (diff)
Fix various linking errors and segfaults.
Diffstat (limited to 'src/game/g_combat.c')
-rw-r--r--src/game/g_combat.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/game/g_combat.c b/src/game/g_combat.c
index a9c3999..65bd8d5 100644
--- a/src/game/g_combat.c
+++ b/src/game/g_combat.c
@@ -1411,16 +1411,14 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker,
targ->health = targ->health - take;
if( targ->client )
+ {
targ->client->ps.stats[ STAT_HEALTH ] = targ->health;
- //turn off cloak if it is already activated and if the target is damaged
- if( targ->client->ps.stats[ STAT_TEAM ] == TEAM_HUMANS )
- {
- if( targ->client->cloakActivated )
- {
- if( !( targ->client->cloakReady ) )
- targ->client->ps.eFlags &= ~EF_MOVER_STOP;
- }
+ //turn off cloak if it is already activated and if the target is damaged
+ if( targ->client->ps.stats[ STAT_TEAM ] == TEAM_HUMANS &&
+ targ->client->cloakActivated &&
+ !targ->client->cloakReady )
+ targ->client->ps.eFlags &= ~EF_MOVER_STOP;
}
}