diff options
| author | Charles Cabergs <me@cacharle.xyz> | 2020-11-17 16:51:56 +0100 |
|---|---|---|
| committer | Charles Cabergs <me@cacharle.xyz> | 2020-11-17 16:51:56 +0100 |
| commit | a92013c92bfcd50b0e2561280c9eaa604843ade0 (patch) | |
| tree | b617be1b683acfccbb93162945e3cb1dd8171aac /cpp03/ex00/FragTrap.cpp | |
| parent | 331c3596660fed6c8b04fdfd0a89435ccffaaf20 (diff) | |
| download | piscine_cpp-a92013c92bfcd50b0e2561280c9eaa604843ade0.tar.gz piscine_cpp-a92013c92bfcd50b0e2561280c9eaa604843ade0.tar.bz2 piscine_cpp-a92013c92bfcd50b0e2561280c9eaa604843ade0.zip | |
Fixing missleading indentation error from clang++ on Linux
Diffstat (limited to 'cpp03/ex00/FragTrap.cpp')
| -rw-r--r-- | cpp03/ex00/FragTrap.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/cpp03/ex00/FragTrap.cpp b/cpp03/ex00/FragTrap.cpp index 38bce83..e86915c 100644 --- a/cpp03/ex00/FragTrap.cpp +++ b/cpp03/ex00/FragTrap.cpp @@ -6,7 +6,7 @@ /* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/22 05:20:45 by cacharle #+# #+# */ -/* Updated: 2020/11/12 10:43:53 by cacharle ### ########.fr */ +/* Updated: 2020/11/17 16:46:57 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -69,11 +69,17 @@ void FragTrap::meleeAttack(std::string const& target) const void FragTrap::takeDamage(unsigned int amount) { if (amount < m_armorDamageReduction) + { amount = 0; + } else + { amount -= m_armorDamageReduction; + } if (amount > m_hitPoints) + { amount = m_hitPoints; + } m_hitPoints -= amount; std::cout << "FR4G-TP " << m_name << " takes " << amount |