From 2e0cf63a219d24ef07412deca9b0e6cb02882b46 Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Wed, 11 Nov 2020 08:27:14 +0100 Subject: Fixing small bugs in cpp03 --- cpp03/ex04/NinjaTrap.cpp | 51 +++++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 27 deletions(-) (limited to 'cpp03/ex04/NinjaTrap.cpp') diff --git a/cpp03/ex04/NinjaTrap.cpp b/cpp03/ex04/NinjaTrap.cpp index 2a27eec..384f77b 100644 --- a/cpp03/ex04/NinjaTrap.cpp +++ b/cpp03/ex04/NinjaTrap.cpp @@ -6,38 +6,34 @@ /* By: charles +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/04/13 17:33:00 by charles #+# #+# */ -/* Updated: 2020/04/13 17:47:20 by charles ### ########.fr */ +/* Updated: 2020/11/11 06:49:09 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ #include "NinjaTrap.hpp" -NinjaTrap::NinjaTrap(): - ClapTrap() +NinjaTrap::NinjaTrap() : ClapTrap() { - m_prefix = "NINJ4-TP "; - m_hitPoints = 60; - m_maxHitPoints = 60; - m_energyPoints = 120; - m_maxEnergyPoints = 120; - m_meleeAttackDamage = 60; - m_rangedAttackDamage = 5; + m_hitPoints = 60; + m_maxHitPoints = 60; + m_energyPoints = 120; + m_maxEnergyPoints = 120; + m_meleeAttackDamage = 60; + m_rangedAttackDamage = 5; m_armorDamageReduction = 0; - std::cout << m_prefix << "New " << m_name << ": your gaming references suck" << std::endl; + std::cout << "NINJ4-TP New " << m_name << ": your gaming references suck" << std::endl; } -NinjaTrap::NinjaTrap(std::string name): - ClapTrap(name) +NinjaTrap::NinjaTrap(std::string const& name) : ClapTrap(name) { - m_prefix = "NINJ4-TP "; - m_hitPoints = 60; - m_maxHitPoints = 60; - m_energyPoints = 120; - m_maxEnergyPoints = 120; - m_meleeAttackDamage = 60; - m_rangedAttackDamage = 5; + m_hitPoints = 60; + m_maxHitPoints = 60; + m_energyPoints = 120; + m_maxEnergyPoints = 120; + m_meleeAttackDamage = 60; + m_rangedAttackDamage = 5; m_armorDamageReduction = 0; - std::cout << m_prefix << "New " << m_name << ": your gaming references suck" << std::endl; + std::cout << " NINJ4-TP New " << m_name << ": your gaming references suck" << std::endl; } NinjaTrap::NinjaTrap(NinjaTrap const& other) @@ -45,7 +41,7 @@ NinjaTrap::NinjaTrap(NinjaTrap const& other) *this = other; } -void NinjaTrap::operator=(NinjaTrap const& other) +NinjaTrap& NinjaTrap::operator=(NinjaTrap const& other) { m_hitPoints = other.m_hitPoints; m_maxHitPoints = other.m_maxHitPoints; @@ -55,37 +51,38 @@ void NinjaTrap::operator=(NinjaTrap const& other) m_meleeAttackDamage = other.m_meleeAttackDamage; m_rangedAttackDamage = other.m_rangedAttackDamage; m_armorDamageReduction = other.m_armorDamageReduction; + return *this; } NinjaTrap::~NinjaTrap() { - std::cout << m_prefix << "Delete "<< m_name << ": your gaming references still suck" << std::endl; + std::cout << "NINJ4-TP Delete "<< m_name << ": your gaming references still suck" << std::endl; } void NinjaTrap::ninjaShoebox(NinjaTrap const& target) { (void)target; - std::cout << m_prefix << m_name + std::cout << "NINJ4-TP " << m_name << " attack other ninja trap, the guy who made the subject didn't gave a fuck" << std::endl; } void NinjaTrap::ninjaShoebox(FragTrap const& target) { (void)target; - std::cout << m_prefix << m_name + std::cout << "NINJ4-TP " << m_name << " attack frag trap, leave me alone" << std::endl; } void NinjaTrap::ninjaShoebox(ScavTrap const& target) { (void)target; - std::cout << m_prefix << m_name + std::cout << "NINJ4-TP " << m_name << " attack sciv trap, ehehehe look at me I'm being funny" << std::endl; } void NinjaTrap::ninjaShoebox(ClapTrap const& target) { (void)target; - std::cout << m_prefix << m_name + std::cout << "NINJ4-TP " << m_name << " attack clap trap, ISN'T THAT WHAT YOU WANTED" << std::endl; } -- cgit