From a92013c92bfcd50b0e2561280c9eaa604843ade0 Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Tue, 17 Nov 2020 16:51:56 +0100 Subject: Fixing missleading indentation error from clang++ on Linux --- cpp03/ex02/ClapTrap.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'cpp03/ex02/ClapTrap.cpp') diff --git a/cpp03/ex02/ClapTrap.cpp b/cpp03/ex02/ClapTrap.cpp index 550cef4..870cbdd 100644 --- a/cpp03/ex02/ClapTrap.cpp +++ b/cpp03/ex02/ClapTrap.cpp @@ -6,7 +6,7 @@ /* By: charles +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/04/13 15:28:43 by charles #+# #+# */ -/* Updated: 2020/11/12 10:08:15 by cacharle ### ########.fr */ +/* Updated: 2020/11/17 16:48:43 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -69,9 +69,13 @@ void ClapTrap::meleeAttack(std::string const& target) const void ClapTrap::takeDamage(unsigned int amount) { if (amount < m_armorDamageReduction) + { amount = 0; + } else + { amount -= m_armorDamageReduction; + } if (amount > m_hitPoints) amount = m_hitPoints; m_hitPoints -= amount; -- cgit