Make remove "ClapTrap" from inherited functions

So that the child classes don't have to overwrite the repair and
takeDamage methods while not confusing user by calling Scav- and
FragTraps ClapTraps, the "ClapTrap" is removed from the functions.

diff --git a/ex00/ClapTrap.cpp b/ex00/ClapTrap.cpp
index 9fb2e9dc76dda008e46957419649631330465482..208bb082347acfca3e21abfa08e617680285f628 100644 (file)
--- a/ex00/ClapTrap.cpp
+++ b/ex00/ClapTrap.cpp
@@ -32,17 +32,17 @@ void        ClapTrap::attack(const std::string &target)
 void   ClapTrap::takeDamage(unsigned int amount)
 {
        if (m_hp == 0)
-               std::cout << "ClapTrap " << m_name <<
+               std::cout << m_name <<
                        " is already dead and cannot be damaged further.\n";
        else if (amount >= m_hp)
        {
-               std::cout << "ClapTrap " << m_name
+               std::cout << m_name
                        << " takes " << amount << " damage and dies\n";
                m_hp = 0;
        }
        else
        {
-               std::cout << "ClapTrap " << m_name
+               std::cout << m_name
                        << " takes " << amount << " damage.\n";
                m_hp -= amount;
        }
@@ -51,14 +51,14 @@ void        ClapTrap::takeDamage(unsigned int amount)
 void   ClapTrap::beRepaired(unsigned int amount)
 {
        if (m_hp == 0)
-               std::cout << "ClapTrap " << m_name
+               std::cout << m_name
                        << " is dead, hence cannot repair itself.\n";
        else if (m_energy == 0)
-               std::cout << "ClapTrap " << m_name
+               std::cout << m_name
                        << " does not have enough energy to repair itself.\n";
        else
        {
-               std::cout << "ClapTrap " << m_name
+               std::cout << m_name
                        << " repairs iself for " << amount << " hit points.\n";
                m_hp += amount;
        }

diff --git a/ex01/ClapTrap.cpp b/ex01/ClapTrap.cpp
index 9fb2e9dc76dda008e46957419649631330465482..208bb082347acfca3e21abfa08e617680285f628 100644 (file)
--- a/ex01/ClapTrap.cpp
+++ b/ex01/ClapTrap.cpp
@@ -32,17 +32,17 @@ void        ClapTrap::attack(const std::string &target)
 void   ClapTrap::takeDamage(unsigned int amount)
 {
        if (m_hp == 0)
-               std::cout << "ClapTrap " << m_name <<
+               std::cout << m_name <<
                        " is already dead and cannot be damaged further.\n";
        else if (amount >= m_hp)
        {
-               std::cout << "ClapTrap " << m_name
+               std::cout << m_name
                        << " takes " << amount << " damage and dies\n";
                m_hp = 0;
        }
        else
        {
-               std::cout << "ClapTrap " << m_name
+               std::cout << m_name
                        << " takes " << amount << " damage.\n";
                m_hp -= amount;
        }
@@ -51,14 +51,14 @@ void        ClapTrap::takeDamage(unsigned int amount)
 void   ClapTrap::beRepaired(unsigned int amount)
 {
        if (m_hp == 0)
-               std::cout << "ClapTrap " << m_name
+               std::cout << m_name
                        << " is dead, hence cannot repair itself.\n";
        else if (m_energy == 0)
-               std::cout << "ClapTrap " << m_name
+               std::cout << m_name
                        << " does not have enough energy to repair itself.\n";
        else
        {
-               std::cout << "ClapTrap " << m_name
+               std::cout << m_name
                        << " repairs iself for " << amount << " hit points.\n";
                m_hp += amount;
        }

diff --git a/ex02/ClapTrap.cpp b/ex02/ClapTrap.cpp
index 9fb2e9dc76dda008e46957419649631330465482..208bb082347acfca3e21abfa08e617680285f628 100644 (file)
--- a/ex02/ClapTrap.cpp
+++ b/ex02/ClapTrap.cpp
@@ -32,17 +32,17 @@ void        ClapTrap::attack(const std::string &target)
 void   ClapTrap::takeDamage(unsigned int amount)
 {
        if (m_hp == 0)
-               std::cout << "ClapTrap " << m_name <<
+               std::cout << m_name <<
                        " is already dead and cannot be damaged further.\n";
        else if (amount >= m_hp)
        {
-               std::cout << "ClapTrap " << m_name
+               std::cout << m_name
                        << " takes " << amount << " damage and dies\n";
                m_hp = 0;
        }
        else
        {
-               std::cout << "ClapTrap " << m_name
+               std::cout << m_name
                        << " takes " << amount << " damage.\n";
                m_hp -= amount;
        }
@@ -51,14 +51,14 @@ void        ClapTrap::takeDamage(unsigned int amount)
 void   ClapTrap::beRepaired(unsigned int amount)
 {
        if (m_hp == 0)
-               std::cout << "ClapTrap " << m_name
+               std::cout << m_name
                        << " is dead, hence cannot repair itself.\n";
        else if (m_energy == 0)
-               std::cout << "ClapTrap " << m_name
+               std::cout << m_name
                        << " does not have enough energy to repair itself.\n";
        else
        {
-               std::cout << "ClapTrap " << m_name
+               std::cout << m_name
                        << " repairs iself for " << amount << " hit points.\n";
                m_hp += amount;
        }