Fixing small bugs in cpp03

1 files changed, 35 insertions, 37 deletions

diff --git a/cpp03/ex04/SuperTrap.cpp b/cpp03/ex04/SuperTrap.cpp
index 7e96570..1555956 100644
--- a/cpp03/ex04/SuperTrap.cpp
+++ b/cpp03/ex04/SuperTrap.cpp
@@ -6,40 +6,38 @@
 /*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/04/13 17:52:56 by charles           #+#    #+#             */
-/*   Updated: 2020/11/10 14:44:33 by cacharle         ###   ########.fr       */
+/*   Updated: 2020/11/11 08:15:03 by cacharle         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "SuperTrap.hpp"
 
-SuperTrap::SuperTrap() :
-    m_prefix("SUP3R-TP"),
-    m_hitPoints(100),
-    m_maxHitPoints(100),
-    m_energyPoints(100),
-    m_maxEnergyPoints(100),
-    m_level(1),
-    m_name(""),
-    m_meleeAttackDamage(0),
-    m_rangedAttackDamage(0),
-    m_armorDamageReduction(0)
+SuperTrap::SuperTrap() : ClapTrap(), FragTrap(), NinjaTrap()
 {
-	std::cout << m_prefix << "New " << m_name << ": your gaming references suck" << std::endl;
+    // m_hitPoints            = 100;
+    // m_maxHitPoints         = 100;
+    // m_energyPoints         = 100;
+    // m_maxEnergyPoints      = 100;
+    // m_level                = 1;
+    // m_name                 = "";
+    // m_meleeAttackDamage    = 0;
+    // m_rangedAttackDamage   = 0;
+    // m_armorDamageReduction = 0;
+	// std::cout << "SUP3R-TP New " << m_name << ": your gaming references suck" << std::endl;
 }
 
-SuperTrap::SuperTrap(std::string const& name) :
-    m_prefix("SUP3R-TP"),
-    m_hitPoints(100),
-    m_maxHitPoints(100),
-    m_energyPoints(100),
-    m_maxEnergyPoints(100),
-    m_level(1),
-    m_name(name),
-    m_meleeAttackDamage(0),
-    m_rangedAttackDamage(0),
-    m_armorDamageReduction(0)
+SuperTrap::SuperTrap(std::string const& name) : ClapTrap(name), FragTrap(name), NinjaTrap(name)
 {
-	std::cout << m_prefix << "New " << m_name << ": your gaming references suck" << std::endl;
+    m_hitPoints            = 100;
+    // m_maxHitPoints         = 100;
+    // m_energyPoints         = 100;
+    // m_maxEnergyPoints      = 100;
+    // m_level                = 1;
+    // m_name                 = name;
+    // m_meleeAttackDamage    = 0;
+    // m_rangedAttackDamage   = 0;
+    // m_armorDamageReduction = 0;
+	// std::cout << "SUP3R-TP New " << m_name << ": your gaming references suck" << std::endl;
 }
 
 SuperTrap::SuperTrap(SuperTrap const& other)
@@ -47,30 +45,30 @@ SuperTrap::SuperTrap(SuperTrap const& other)
     *this = other;
 }
 
-void SuperTrap::operator=(SuperTrap const& other)
+SuperTrap& SuperTrap::operator=(SuperTrap const& other)
 {
-    m_hitPoints            = other.m_hitPoints;
-    m_maxHitPoints         = other.m_maxHitPoints;
-    m_energyPoints         = other.m_energyPoints;
-    m_maxEnergyPoints      = other.m_maxEnergyPoints;
-    m_level                = other.m_level;
-    m_meleeAttackDamage    = other.m_meleeAttackDamage;
-    m_rangedAttackDamage   = other.m_rangedAttackDamage;
-    m_armorDamageReduction = other.m_armorDamageReduction;
+    // m_hitPoints            = other.m_hitPoints;
+    // m_maxHitPoints         = other.m_maxHitPoints;
+    // m_energyPoints         = other.m_energyPoints;
+    // m_maxEnergyPoints      = other.m_maxEnergyPoints;
+    // m_level                = other.m_level;
+    // m_meleeAttackDamage    = other.m_meleeAttackDamage;
+    // m_rangedAttackDamage   = other.m_rangedAttackDamage;
+    // m_armorDamageReduction = other.m_armorDamageReduction;
     return *this;
 }
 
 SuperTrap::~SuperTrap()
 {
-	std::cout << "SUP3R-TP" << "Delete "<< m_name << ": your gaming references still suck" << std::endl;
+	// std::cout << "SUP3R-TP Delete "<< m_name << ": your gaming references still suck" << std::endl;
 }
 
 void SuperTrap::rangedAttack(std::string const& target) const
 {
-    FragTrap::rangedArray(target);
+    // FragTrap::rangedArray(target);
 }
 
 void SuperTrap::meleeAttack(std::string const& target) const
 {
-    NinjaTrap::rangedArray(target);
+    // NinjaTrap::rangedArray(target);
 }