Fixing small bugs in cpp03

2 files changed, 7 insertions, 12 deletions

diff --git a/cpp03/ex01/ScavTrap.cpp b/cpp03/ex01/ScavTrap.cpp
index 8379228..16b07e1 100644
--- a/cpp03/ex01/ScavTrap.cpp
+++ b/cpp03/ex01/ScavTrap.cpp
@@ -6,7 +6,7 @@
 /*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/04/13 14:15:03 by charles           #+#    #+#             */
-/*   Updated: 2020/11/10 15:06:00 by cacharle         ###   ########.fr       */
+/*   Updated: 2020/11/11 06:32:05 by cacharle         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -81,9 +81,10 @@ void ScavTrap::meleeAttack(std::string const& target) const
 
 void ScavTrap::takeDamage(unsigned int amount)
 {
-    amount -= m_armorDamageReduction;
-    if (amount < 0)
+    if (amount < m_armorDamageReduction)
         amount = 0;
+    else
+        amount -= m_armorDamageReduction;
 	if (amount > m_hitPoints)
         amount = m_hitPoints;
 	m_hitPoints -= amount;
diff --git a/cpp03/ex01/main.cpp b/cpp03/ex01/main.cpp
index 4e01067..13ed4e6 100644
--- a/cpp03/ex01/main.cpp
+++ b/cpp03/ex01/main.cpp
@@ -6,7 +6,7 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/02/22 05:41:27 by cacharle          #+#    #+#             */
-/*   Updated: 2020/11/10 14:21:47 by cacharle         ###   ########.fr       */
+/*   Updated: 2020/11/11 06:53:25 by cacharle         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -32,13 +32,11 @@ int main(void)
     std::cout << "=== ATTACK ===" << std::endl;
     ft.rangedAttack("a dog");
     ft.meleeAttack("a cat");
-
     std::cout << std::endl << "=== DAMAGE ===" << std::endl;
     ft.takeDamage(0);
     ft.beRepaired(0);
     ft.takeDamage(10);
     ft.beRepaired(10);
-
     std::cout << std::endl << "=== VAULTHUNTER ===" << std::endl;
     ft.vaulthunter_dot_exe("your mom");
     ft.vaulthunter_dot_exe("your dad");
@@ -46,31 +44,27 @@ int main(void)
     ft.vaulthunter_dot_exe("your sister");
     std::cout << "=== VAULTHUNTER NO ENERGY ===" << std::endl;
     ft.vaulthunter_dot_exe("your grandma");
-
     std::cout << std::endl << "=== OVER LIMIT ===" << std::endl;
     ft.takeDamage(1000);
     ft.beRepaired(1000);
 
-    std::cout << std::endl << std::endl << std::endl;
+    std::cout << std::endl << std::endl;
+
     ScavTrap scav("jean");
     std::cout << "=== ATTACK ===" << std::endl;
     scav.rangedAttack("a dog");
     scav.meleeAttack("a cat");
-
     std::cout << std::endl << "=== DAMAGE ===" << std::endl;
     scav.takeDamage(0);
     scav.beRepaired(0);
     scav.takeDamage(10);
     scav.beRepaired(10);
-
     std::cout << std::endl << "=== CHALLENGE NEW COMER ===" << std::endl;
     scav.challengeNewcomer("your mom");
     scav.challengeNewcomer("your dad");
     scav.challengeNewcomer("your brother");
     scav.challengeNewcomer("your sister");
-    std::cout << "=== VAULTHUNTER NO ENERGY ===" << std::endl;
     scav.challengeNewcomer("your grandma");
-
     std::cout << std::endl << "=== OVER LIMIT ===" << std::endl;
     scav.takeDamage(1000);
     scav.beRepaired(1000);