From c3227729e7fbc6e653cd91498ffeb6322fbe4861 Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Sun, 8 Feb 2015 20:54:13 -0600 Subject: [PATCH] Remove superfluous if in DoGiveInv() - I'm assuming this check was here for a reason, but when both branches of the if do the same thing and it's been this way since before recorded history, it's not obvious what was intended here. --- src/p_acs.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/p_acs.cpp b/src/p_acs.cpp index 8c6631b5e4..b5233bb709 100644 --- a/src/p_acs.cpp +++ b/src/p_acs.cpp @@ -1066,14 +1066,7 @@ static void DoGiveInv (AActor *actor, const PClass *info, int amount) item->ClearCounters(); if (info->IsDescendantOf (RUNTIME_CLASS(ABasicArmorPickup))) { - if (static_cast(item)->SaveAmount != 0) - { - static_cast(item)->SaveAmount *= amount; - } - else - { - static_cast(item)->SaveAmount *= amount; - } + static_cast(item)->SaveAmount *= amount; } else if (info->IsDescendantOf (RUNTIME_CLASS(ABasicArmorBonus))) {