From 0cc6822a1121cf8c6ba8acb80b3592e4459d1a99 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Thu, 17 May 2012 10:57:57 +0000 Subject: [PATCH] - ensure that the 'owner' variable in the missile spawning functions is always valid. SVN r3660 (trunk) --- src/p_mobj.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp index b48ef9732..d87650978 100644 --- a/src/p_mobj.cpp +++ b/src/p_mobj.cpp @@ -5253,8 +5253,8 @@ AActor *P_SpawnMissileXYZ (fixed_t x, fixed_t y, fixed_t z, P_PlaySpawnSound(th, source); // record missile's originator - if (owner) th->target = owner; - else th->target = source; + if (owner == NULL) owner = source; + th->target = owner; float speed = (float)(th->Speed); @@ -5420,7 +5420,8 @@ AActor *P_SpawnMissileAngleZSpeed (AActor *source, fixed_t z, mo = Spawn (type, source->x, source->y, z, ALLOW_REPLACE); P_PlaySpawnSound(mo, source); - mo->target = owner != NULL ? owner : source; // Originator + if (owner == NULL) owner = source; + mo->target = owner; mo->angle = angle; angle >>= ANGLETOFINESHIFT; mo->velx = FixedMul (speed, finecosine[angle]);