From a84ff7d969ae881d8d8a3b6b5771f78de716f39b Mon Sep 17 00:00:00 2001 From: Raphael Date: Mon, 10 Feb 2025 12:11:38 +0100 Subject: [PATCH] feat: change the return of the overload '=' --- cpp03/ex00/ClapTrap.cpp | 11 ++++++++++- cpp03/ex01/ClapTrap.cpp | 13 +++++++++++-- cpp03/ex01/ScavTrap.cpp | 12 +++++++++++- cpp03/ex02/ClapTrap.cpp | 4 ++-- cpp03/ex02/FragTrap.cpp | 4 ++-- cpp03/ex02/ScavTrap.cpp | 4 ++-- 6 files changed, 38 insertions(+), 10 deletions(-) diff --git a/cpp03/ex00/ClapTrap.cpp b/cpp03/ex00/ClapTrap.cpp index c931428..a00e5d7 100644 --- a/cpp03/ex00/ClapTrap.cpp +++ b/cpp03/ex00/ClapTrap.cpp @@ -6,7 +6,7 @@ /* By: rparodi +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/01/10 13:59:49 by rparodi #+# #+# */ -/* Updated: 2025/02/10 10:55:30 by rparodi ### ########.fr */ +/* Updated: 2025/02/10 12:09:57 by rparodi ### ########.fr */ /* */ /* ************************************************************************** */ @@ -39,6 +39,15 @@ ClapTrap::ClapTrap(ClapTrap const ©) { std::cout << "\n[Init] ClapTrap (copy):\n\t" << "Name: " << _name << std::endl; } +ClapTrap& ClapTrap::operator=(ClapTrap &assign) { + _name = assign._name; + _hit_point = assign._hit_point; + _energy_point = assign._energy_point; + _attack_damage = assign._attack_damage; + std::cout << "\n[Init] ClapTrap (assign):\n\t" << "Name: " << _name << std::endl; + return (*this); +} + ClapTrap::~ClapTrap() { std::cout << "\n[Delete] ClapTrap:\n\t" << "Name: " << _name << std::endl; } diff --git a/cpp03/ex01/ClapTrap.cpp b/cpp03/ex01/ClapTrap.cpp index ee8495a..a00e5d7 100644 --- a/cpp03/ex01/ClapTrap.cpp +++ b/cpp03/ex01/ClapTrap.cpp @@ -6,7 +6,7 @@ /* By: rparodi +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/01/10 13:59:49 by rparodi #+# #+# */ -/* Updated: 2025/02/10 10:53:38 by rparodi ### ########.fr */ +/* Updated: 2025/02/10 12:09:57 by rparodi ### ########.fr */ /* */ /* ************************************************************************** */ @@ -20,7 +20,7 @@ ClapTrap::ClapTrap() { _energy_point = 0; _attack_damage = 0; - std::cout << "\n[Init] ClapTrap (no_name):\n\t" << "Name: " << _name << std::endl; + std::cout << "\n[Init] ClapTrap (no_name)" << std::endl; } ClapTrap::ClapTrap(std::string name) { @@ -39,6 +39,15 @@ ClapTrap::ClapTrap(ClapTrap const ©) { std::cout << "\n[Init] ClapTrap (copy):\n\t" << "Name: " << _name << std::endl; } +ClapTrap& ClapTrap::operator=(ClapTrap &assign) { + _name = assign._name; + _hit_point = assign._hit_point; + _energy_point = assign._energy_point; + _attack_damage = assign._attack_damage; + std::cout << "\n[Init] ClapTrap (assign):\n\t" << "Name: " << _name << std::endl; + return (*this); +} + ClapTrap::~ClapTrap() { std::cout << "\n[Delete] ClapTrap:\n\t" << "Name: " << _name << std::endl; } diff --git a/cpp03/ex01/ScavTrap.cpp b/cpp03/ex01/ScavTrap.cpp index dbc59b9..1d6e9fc 100644 --- a/cpp03/ex01/ScavTrap.cpp +++ b/cpp03/ex01/ScavTrap.cpp @@ -6,7 +6,7 @@ /* By: rparodi +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/01/24 17:41:01 by rparodi #+# #+# */ -/* Updated: 2025/02/10 10:56:14 by rparodi ### ########.fr */ +/* Updated: 2025/02/10 12:10:42 by rparodi ### ########.fr */ /* */ /* ************************************************************************** */ @@ -39,6 +39,16 @@ ScavTrap::ScavTrap (std::string name) { std::cout << "\n[Init] ScavTrap:\n\t" << "Name: " << _name << std::endl; } +ScavTrap& ScavTrap::operator=(ScavTrap &assign) { + _name = assign._name; + _hit_point = assign._hit_point; + _energy_point = assign._energy_point; + _attack_damage = assign._attack_damage; + _gateKeeperMode = assign._gateKeeperMode; + std::cout << "\n[Init] ScavTrap (assign):\n\t" << "Name: " << _name << std::endl; + return *this; +} + ScavTrap::~ScavTrap() { } diff --git a/cpp03/ex02/ClapTrap.cpp b/cpp03/ex02/ClapTrap.cpp index d978626..a00e5d7 100644 --- a/cpp03/ex02/ClapTrap.cpp +++ b/cpp03/ex02/ClapTrap.cpp @@ -6,7 +6,7 @@ /* By: rparodi +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/01/10 13:59:49 by rparodi #+# #+# */ -/* Updated: 2025/02/10 11:13:02 by rparodi ### ########.fr */ +/* Updated: 2025/02/10 12:09:57 by rparodi ### ########.fr */ /* */ /* ************************************************************************** */ @@ -45,7 +45,7 @@ ClapTrap& ClapTrap::operator=(ClapTrap &assign) { _energy_point = assign._energy_point; _attack_damage = assign._attack_damage; std::cout << "\n[Init] ClapTrap (assign):\n\t" << "Name: " << _name << std::endl; - return (assign); + return (*this); } ClapTrap::~ClapTrap() { diff --git a/cpp03/ex02/FragTrap.cpp b/cpp03/ex02/FragTrap.cpp index aa3844b..292ee8b 100644 --- a/cpp03/ex02/FragTrap.cpp +++ b/cpp03/ex02/FragTrap.cpp @@ -6,7 +6,7 @@ /* By: rparodi +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/01/24 17:41:01 by rparodi #+# #+# */ -/* Updated: 2025/02/10 11:13:33 by rparodi ### ########.fr */ +/* Updated: 2025/02/10 12:10:09 by rparodi ### ########.fr */ /* */ /* ************************************************************************** */ @@ -42,7 +42,7 @@ FragTrap& FragTrap::operator=(FragTrap &assign) { _energy_point = assign._energy_point; _attack_damage = assign._attack_damage; std::cout << "\n[Init] FragTrap (assign):\n\t" << "Name: " << _name << std::endl; - return (assign); + return (*this); } FragTrap::~FragTrap() { diff --git a/cpp03/ex02/ScavTrap.cpp b/cpp03/ex02/ScavTrap.cpp index a65fe82..1d6e9fc 100644 --- a/cpp03/ex02/ScavTrap.cpp +++ b/cpp03/ex02/ScavTrap.cpp @@ -6,7 +6,7 @@ /* By: rparodi +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/01/24 17:41:01 by rparodi #+# #+# */ -/* Updated: 2025/02/10 11:12:27 by rparodi ### ########.fr */ +/* Updated: 2025/02/10 12:10:42 by rparodi ### ########.fr */ /* */ /* ************************************************************************** */ @@ -46,7 +46,7 @@ ScavTrap& ScavTrap::operator=(ScavTrap &assign) { _attack_damage = assign._attack_damage; _gateKeeperMode = assign._gateKeeperMode; std::cout << "\n[Init] ScavTrap (assign):\n\t" << "Name: " << _name << std::endl; - return (assign); + return *this; } ScavTrap::~ScavTrap() {