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/ScavTrap.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/ScavTrap.cpp')
| -rw-r--r-- | cpp03/ex03/ScavTrap.cpp | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/cpp03/ex03/ScavTrap.cpp b/cpp03/ex03/ScavTrap.cpp index a1f4a17..1acf126 100644 --- a/cpp03/ex03/ScavTrap.cpp +++ b/cpp03/ex03/ScavTrap.cpp @@ -6,32 +6,28 @@ /* By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/04/13 14:15:03 by charles #+# #+# */ -/* Updated: 2020/11/10 15:06:20 by cacharle ### ########.fr */ +/* Updated: 2020/11/11 06:42:58 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ #include "ScavTrap.hpp" -ScavTrap::ScavTrap(): - ClapTrap() +ScavTrap::ScavTrap() : ClapTrap() { - m_prefix = "SC4V-TP "; - m_energyPoints = 50; - m_maxEnergyPoints = 50; - m_meleeAttackDamage = 20; - m_rangedAttackDamage = 15; + m_energyPoints = 50; + m_maxEnergyPoints = 50; + m_meleeAttackDamage = 20; + m_rangedAttackDamage = 15; m_armorDamageReduction = 3; - std::cout << "New " << m_name << ": your gaming references suck" << std::endl; + std::cout << "SC4V-TP New " << m_name << ": your gaming references suck" << std::endl; } -ScavTrap::ScavTrap(std::string name): - ClapTrap(name) +ScavTrap::ScavTrap(std::string const& name) : ClapTrap(name) { - m_prefix = "SC4V-TP "; - m_energyPoints = 50; - m_maxEnergyPoints = 50; - m_meleeAttackDamage = 20; - m_rangedAttackDamage = 15; + m_energyPoints = 50; + m_maxEnergyPoints = 50; + m_meleeAttackDamage = 20; + m_rangedAttackDamage = 15; m_armorDamageReduction = 3; std::cout << "SC4V-TP New " << m_name << ": your gaming references suck" << std::endl; } @@ -41,7 +37,7 @@ ScavTrap::ScavTrap(ScavTrap const& other) *this = other; } -void ScavTrap::operator=(ScavTrap const& other) +ScavTrap& ScavTrap::operator=(ScavTrap const& other) { m_hitPoints = other.m_hitPoints; m_maxHitPoints = other.m_maxHitPoints; @@ -51,6 +47,7 @@ void ScavTrap::operator=(ScavTrap const& other) m_meleeAttackDamage = other.m_meleeAttackDamage; m_rangedAttackDamage = other.m_rangedAttackDamage; m_armorDamageReduction = other.m_armorDamageReduction; + return *this; } ScavTrap::~ScavTrap() |