diff options
Diffstat (limited to 'cpp03/ex00')
| -rw-r--r-- | cpp03/ex00/FragTrap.cpp | 8 | ||||
| -rw-r--r-- | cpp03/ex00/main.cpp | 4 |
2 files changed, 10 insertions, 2 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 diff --git a/cpp03/ex00/main.cpp b/cpp03/ex00/main.cpp index dd3f8bd..84a93aa 100644 --- a/cpp03/ex00/main.cpp +++ b/cpp03/ex00/main.cpp @@ -6,7 +6,7 @@ /* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/22 05:41:27 by cacharle #+# #+# */ -/* Updated: 2020/11/12 10:42:38 by cacharle ### ########.fr */ +/* Updated: 2020/11/17 16:46:11 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -25,7 +25,9 @@ int main(void) devRandom.close(); } else + { seed = time(NULL); + } srand(seed); { |