From 4efda9b8302215bf6135697cd5f61f4f91576e3e Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Mon, 23 Oct 2017 18:54:10 -0400 Subject: [PATCH] Remove some redundancies from the last commit --- src/p_enemy.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/p_enemy.c b/src/p_enemy.c index e4b1f302..0de2dfb3 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -8091,7 +8091,11 @@ void A_ItemPop(mobj_t *actor) mobj_t *remains; if (!(actor->target && actor->target->player && P_CanPickupItem(actor->target->player, false))) + { + if (cv_debug && !(actor->target && actor->target->player)) + CONS_Printf("ERROR: Powerup has no target!\n"); return; + } // de-solidify //P_UnsetThingPosition(actor); @@ -8126,10 +8130,7 @@ void A_ItemPop(mobj_t *actor) return; } - if (actor->target && actor->target->player) - actor->target->player->kartstuff[k_itemroulette] = 1; - else if (cv_debug && !(actor->target && actor->target->player)) - CONS_Printf("ERROR: Powerup has no target!\n"); + actor->target->player->kartstuff[k_itemroulette] = 1; remains->flags2 &= ~MF2_AMBUSH;