diff options
| author | Charles Cabergs <me@cacharle.xyz> | 2020-11-11 08:27:14 +0100 |
|---|---|---|
| committer | Charles Cabergs <me@cacharle.xyz> | 2020-11-11 08:27:14 +0100 |
| commit | 2e0cf63a219d24ef07412deca9b0e6cb02882b46 (patch) | |
| tree | 79d11973ea3c40b8e7cbe0eeefba56dacfbb0583 /cpp03/ex03/FragTrap.cpp | |
| parent | aa40eb5dedd39263ff511de01d6833d24e33b736 (diff) | |
| download | piscine_cpp-2e0cf63a219d24ef07412deca9b0e6cb02882b46.tar.gz piscine_cpp-2e0cf63a219d24ef07412deca9b0e6cb02882b46.tar.bz2 piscine_cpp-2e0cf63a219d24ef07412deca9b0e6cb02882b46.zip | |
Fixing small bugs in cpp03
Diffstat (limited to 'cpp03/ex03/FragTrap.cpp')
| -rw-r--r-- | cpp03/ex03/FragTrap.cpp | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/cpp03/ex03/FragTrap.cpp b/cpp03/ex03/FragTrap.cpp index 4db102e..9ab2ffc 100644 --- a/cpp03/ex03/FragTrap.cpp +++ b/cpp03/ex03/FragTrap.cpp @@ -6,32 +6,28 @@ /* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/22 05:20:45 by cacharle #+# #+# */ -/* Updated: 2020/04/13 15:46:59 by charles ### ########.fr */ +/* Updated: 2020/11/11 06:42:32 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ #include "FragTrap.hpp" -FragTrap::FragTrap(): - ClapTrap() +FragTrap::FragTrap() : ClapTrap() { - m_prefix = "FR4G-TP "; - m_energyPoints = 100; - m_maxEnergyPoints = 100; - m_meleeAttackDamage = 30; - m_rangedAttackDamage = 20; + m_energyPoints = 100; + m_maxEnergyPoints = 100; + m_meleeAttackDamage = 30; + m_rangedAttackDamage = 20; m_armorDamageReduction = 5; std::cout << "FR4G-TP New " << m_name << ": your gaming references suck" << std::endl; } -FragTrap::FragTrap(std::string name): - ClapTrap(name) +FragTrap::FragTrap(std::string const& name) : ClapTrap(name) { - m_prefix = "FR4G-TP "; - m_energyPoints = 100; - m_maxEnergyPoints = 100; - m_meleeAttackDamage = 30; - m_rangedAttackDamage = 20; + m_energyPoints = 100; + m_maxEnergyPoints = 100; + m_meleeAttackDamage = 30; + m_rangedAttackDamage = 20; m_armorDamageReduction = 5; std::cout << "FR4G-TP New " << m_name << ": your gaming references suck" << std::endl; } @@ -41,7 +37,7 @@ FragTrap::FragTrap(FragTrap const& other) *this = other; } -void FragTrap::operator=(FragTrap const& other) +FragTrap& FragTrap::operator=(FragTrap const& other) { m_hitPoints = other.m_hitPoints; m_maxHitPoints = other.m_maxHitPoints; @@ -51,11 +47,12 @@ void FragTrap::operator=(FragTrap const& other) m_meleeAttackDamage = other.m_meleeAttackDamage; m_rangedAttackDamage = other.m_rangedAttackDamage; m_armorDamageReduction = other.m_armorDamageReduction; + return *this; } FragTrap::~FragTrap() { - std::cout << m_prefix << "Delete "<< m_name << ": your gaming references still suck" << std::endl; + std::cout << "FR4G-TP Delete "<< m_name << ": your gaming references still suck" << std::endl; } void FragTrap::vaulthunter_dot_exe(std::string const& target) |