aboutsummaryrefslogtreecommitdiff
path: root/cpp03
diff options
context:
space:
mode:
Diffstat (limited to 'cpp03')
-rw-r--r--cpp03/ex00/FragTrap.cpp8
-rw-r--r--cpp03/ex00/main.cpp4
-rw-r--r--cpp03/ex01/FragTrap.cpp8
-rw-r--r--cpp03/ex01/ScavTrap.cpp8
-rw-r--r--cpp03/ex01/main.cpp4
-rw-r--r--cpp03/ex02/ClapTrap.cpp6
-rw-r--r--cpp03/ex02/main.cpp4
-rw-r--r--cpp03/ex03/ClapTrap.cpp4
-rw-r--r--cpp03/ex03/main.cpp4
-rw-r--r--cpp03/ex04/ClapTrap.cpp4
-rw-r--r--cpp03/ex04/main.cpp4
11 files changed, 47 insertions, 11 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);
{
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 <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 <charles.cabergs@gmail.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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);
{
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 <charles.cabergs@gmail.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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;
diff --git a/cpp03/ex02/main.cpp b/cpp03/ex02/main.cpp
index b8a03b6..92fd23b 100644
--- a/cpp03/ex02/main.cpp
+++ b/cpp03/ex02/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:41:46 by cacharle ### ########.fr */
+/* Updated: 2020/11/17 16:46:31 by charles ### ########.fr */
/* */
/* ************************************************************************** */
@@ -26,7 +26,9 @@ int main(void)
devRandom.close();
}
else
+ {
seed = time(NULL);
+ }
srand(seed);
{
diff --git a/cpp03/ex03/ClapTrap.cpp b/cpp03/ex03/ClapTrap.cpp
index 550cef4..9adb925 100644
--- a/cpp03/ex03/ClapTrap.cpp
+++ b/cpp03/ex03/ClapTrap.cpp
@@ -6,7 +6,7 @@
/* By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2020/04/13 15:28:43 by charles #+# #+# */
-/* Updated: 2020/11/12 10:08:15 by cacharle ### ########.fr */
+/* Updated: 2020/11/17 16:49:01 by charles ### ########.fr */
/* */
/* ************************************************************************** */
@@ -71,7 +71,9 @@ 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;
diff --git a/cpp03/ex03/main.cpp b/cpp03/ex03/main.cpp
index 76141ed..c6a5588 100644
--- a/cpp03/ex03/main.cpp
+++ b/cpp03/ex03/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:40:11 by cacharle ### ########.fr */
+/* Updated: 2020/11/17 16:49:18 by charles ### ########.fr */
/* */
/* ************************************************************************** */
@@ -27,7 +27,9 @@ int main(void)
devRandom.close();
}
else
+ {
seed = time(NULL);
+ }
srand(seed);
{
diff --git a/cpp03/ex04/ClapTrap.cpp b/cpp03/ex04/ClapTrap.cpp
index 550cef4..1dceb70 100644
--- a/cpp03/ex04/ClapTrap.cpp
+++ b/cpp03/ex04/ClapTrap.cpp
@@ -6,7 +6,7 @@
/* By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2020/04/13 15:28:43 by charles #+# #+# */
-/* Updated: 2020/11/12 10:08:15 by cacharle ### ########.fr */
+/* Updated: 2020/11/17 16:49:36 by charles ### ########.fr */
/* */
/* ************************************************************************** */
@@ -71,7 +71,9 @@ 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;
diff --git a/cpp03/ex04/main.cpp b/cpp03/ex04/main.cpp
index 0358760..c080dc2 100644
--- a/cpp03/ex04/main.cpp
+++ b/cpp03/ex04/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:13:44 by cacharle ### ########.fr */
+/* Updated: 2020/11/17 16:49:46 by charles ### ########.fr */
/* */
/* ************************************************************************** */
@@ -28,7 +28,9 @@ int main(void)
devRandom.close();
}
else
+ {
seed = time(NULL);
+ }
srand(seed);
{
generated by cgit (git 2.34.1) at 2026-05-16 11:21:32 +0000