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/ex01/FragTrap.cpp | 8 +++++++- cpp03/ex01/ScavTrap.cpp | 8 +++++++- cpp03/ex01/main.cpp | 4 +++- 3 files changed, 17 insertions(+), 3 deletions(-) (limited to 'cpp03/ex01') diff --git a/cpp03/ex01/FragTrap.cpp b/cpp03/ex01/FragTrap.cpp index bbe398a..56466a8 100644 --- a/cpp03/ex01/FragTrap.cpp +++ b/cpp03/ex01/FragTrap.cpp @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/22 05:20:45 by cacharle #+# #+# */ -/* Updated: 2020/11/12 10:44:08 by cacharle ### ########.fr */ +/* Updated: 2020/11/17 16:47:41 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/ex01/ScavTrap.cpp b/cpp03/ex01/ScavTrap.cpp index 47facac..c77291c 100644 --- a/cpp03/ex01/ScavTrap.cpp +++ b/cpp03/ex01/ScavTrap.cpp @@ -6,7 +6,7 @@ /* By: charles +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/04/13 14:15:03 by charles #+# #+# */ -/* Updated: 2020/11/12 10:49:48 by cacharle ### ########.fr */ +/* Updated: 2020/11/17 16:47:57 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -69,11 +69,17 @@ void ScavTrap::meleeAttack(std::string const& target) const void ScavTrap::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 << "SC4V-TP " << m_name << " takes " << amount diff --git a/cpp03/ex01/main.cpp b/cpp03/ex01/main.cpp index 864041c..c8fb9f0 100644 --- a/cpp03/ex01/main.cpp +++ b/cpp03/ex01/main.cpp @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/22 05:41:27 by cacharle #+# #+# */ -/* Updated: 2020/11/12 10:42:13 by cacharle ### ########.fr */ +/* Updated: 2020/11/17 16:46:24 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -26,7 +26,9 @@ int main(void) devRandom.close(); } else + { seed = time(NULL); + } srand(seed); { -- cgit