summaryrefslogtreecommitdiff
path: root/src/game/g_combat.c
diff options
context:
space:
mode:
authorMikko Tiusanen <ams@daug.net>2014-07-22 00:21:00 +0300
committerMikko Tiusanen <ams@daug.net>2014-07-22 00:21:00 +0300
commit4c26da913161e0bc3d5a912c6b154e33c38d9546 (patch)
tree2ec1adbca3e49c502d006f62ace7ade643ecced5 /src/game/g_combat.c
parent8ec700b583a9f061072270d1c18964942f4e17fc (diff)
Added basic portable force field implementation as lasgun secondary fire.
Diffstat (limited to 'src/game/g_combat.c')
-rw-r--r--src/game/g_combat.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/game/g_combat.c b/src/game/g_combat.c
index 5a522a5..c10c8da 100644
--- a/src/game/g_combat.c
+++ b/src/game/g_combat.c
@@ -525,6 +525,12 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
self->client->pers.netname, killerName ) );
goto finish_dying;
}
+
+ // Parent node on player used for tracking the shield projectile
+ if( self->parentNode )
+ {
+ G_FreeEntity(self->parentNode);
+ }
// broadcast the death event to everyone
ent = G_TempEntity( self->r.currentOrigin, EV_OBITUARY );