From 0b2c6585d07b0327f3fd817fe2cb954066ff2a8c Mon Sep 17 00:00:00 2001 From: Runar Ovesen Hjerpbakk Date: Tue, 2 Jun 2020 13:36:47 +0200 Subject: [PATCH 1/2] Removed redundant conditional --- REDALERT/COMBAT.CPP | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/REDALERT/COMBAT.CPP b/REDALERT/COMBAT.CPP index 66f6da9537..05c5544682 100644 --- a/REDALERT/COMBAT.CPP +++ b/REDALERT/COMBAT.CPP @@ -74,7 +74,7 @@ int Modify_Damage(int damage, WarheadType warhead, ArmorType armor, int distance ** If there is no raw damage value to start with, then ** there can be no modified damage either. */ - if (Special.IsInert || !damage || warhead == WARHEAD_NONE) return(0); + if (Special.IsInert || warhead == WARHEAD_NONE) return(0); /* ** Negative damage (i.e., heal) is always applied full strength, but only if the heal From 855802789e8fe7da6cf35c51d448f6a22c3f0d60 Mon Sep 17 00:00:00 2001 From: Runar Ovesen Hjerpbakk Date: Tue, 2 Jun 2020 15:14:08 +0200 Subject: [PATCH 2/2] Removed newline at end of file --- REDALERT/HOUSE.CPP | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/REDALERT/HOUSE.CPP b/REDALERT/HOUSE.CPP index efa15a29b6..f898afd3bb 100644 --- a/REDALERT/HOUSE.CPP +++ b/REDALERT/HOUSE.CPP @@ -8170,4 +8170,4 @@ void HouseClass::Free_Unit_Trackers(void) delete TotalCrates; TotalCrates = NULL; } -} +} \ No newline at end of file