From 4c30e98f4a4018a25d3a9f3ee790d589be803cb0 Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Fri, 13 Nov 2020 14:43:17 +0100 Subject: Added main for cpp04/ex01 and cpp04/ex02, Fixed cpp04/03 MateriaSource --- cpp04/ex02/TacticalMarine.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'cpp04/ex02/TacticalMarine.cpp') diff --git a/cpp04/ex02/TacticalMarine.cpp b/cpp04/ex02/TacticalMarine.cpp index df771e8..cf30d2a 100644 --- a/cpp04/ex02/TacticalMarine.cpp +++ b/cpp04/ex02/TacticalMarine.cpp @@ -6,7 +6,7 @@ /* By: charles +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/04/14 15:31:43 by charles #+# #+# */ -/* Updated: 2020/11/12 15:37:41 by cacharle ### ########.fr */ +/* Updated: 2020/11/13 12:18:14 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -17,7 +17,11 @@ TacticalMarine::TacticalMarine() std::cout << "Tactical Marine ready for battle!" << std::endl; } -TacticalMarine::TacticalMarine(TacticalMarine const& other) { *this = other; } +TacticalMarine::TacticalMarine(TacticalMarine const& other) +{ + std::cout << "Tactical Marine ready for battle!" << std::endl; + *this = other; +} TacticalMarine& TacticalMarine::operator=(TacticalMarine const& other) { @@ -32,8 +36,7 @@ TacticalMarine::~TacticalMarine() ISpaceMarine* TacticalMarine::clone() const { - ISpaceMarine* cloned = new TacticalMarine(); - *cloned = *this; + ISpaceMarine* cloned = new TacticalMarine(*this); return cloned; } -- cgit