Fixing cpp01

6 files changed, 38 insertions, 39 deletions

diff --git a/cpp01/ex06/HumanA.cpp b/cpp01/ex06/HumanA.cpp
index 8d9b449..7e52494 100644
--- a/cpp01/ex06/HumanA.cpp
+++ b/cpp01/ex06/HumanA.cpp
@@ -6,19 +6,18 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/02/02 16:44:03 by cacharle          #+#    #+#             */
-/*   Updated: 2020/02/02 16:54:07 by cacharle         ###   ########.fr       */
+/*   Updated: 2020/04/13 10:26:03 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "HumanA.hpp"
 
-HumanA::HumanA(std::string name, Weapon weapon)
+HumanA::HumanA(std::string name, Weapon& weapon)
+    : m_name(name), m_weapon(weapon)
 {
-	this->name = name;
-	this->weapon = weapon;
 }
 
 void HumanA::attack()
 {
-	std::cout << name << " attack with his " << weapon.getType();
+	std::cout << m_name << " attack with his " << m_weapon.getType() << std::endl;
 }
diff --git a/cpp01/ex06/HumanA.hpp b/cpp01/ex06/HumanA.hpp
index 1c3ccf9..f1691b3 100644
--- a/cpp01/ex06/HumanA.hpp
+++ b/cpp01/ex06/HumanA.hpp
@@ -6,7 +6,7 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/02/02 16:37:23 by cacharle          #+#    #+#             */
-/*   Updated: 2020/02/02 16:54:48 by cacharle         ###   ########.fr       */
+/*   Updated: 2020/04/13 10:24:13 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -18,12 +18,12 @@
 
 class HumanA
 {
-	private:
-		std::string name;
-		Weapon weapon;
-	public:
-		HumanA(std::string(name), Weapon(weapon));
-		void attack();
+public:
+    HumanA(std::string name, Weapon& weapon);
+    void attack();
+private:
+    std::string m_name;
+    Weapon& m_weapon;
 };
 
 #endif
diff --git a/cpp01/ex06/HumanB.cpp b/cpp01/ex06/HumanB.cpp
index e08363c..98774aa 100644
--- a/cpp01/ex06/HumanB.cpp
+++ b/cpp01/ex06/HumanB.cpp
@@ -6,23 +6,23 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/02/02 16:46:02 by cacharle          #+#    #+#             */
-/*   Updated: 2020/02/02 16:54:33 by cacharle         ###   ########.fr       */
+/*   Updated: 2020/04/13 10:25:54 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "HumanB.hpp"
 
 HumanB::HumanB(std::string name)
+    : m_name(name), m_weapon(NULL)
 {
-	this->name = name;
 }
 
 void HumanB::attack()
 {
-	std::cout << name << " attack with his " << weapon.getType();
+	std::cout << m_name << " attack with his " << m_weapon->getType() << std::endl;
 }
 
-void HumanB::setWeapon(Weapon weapon)
+void HumanB::setWeapon(Weapon& weapon)
 {
-	this->weapon = weapon;
+	m_weapon = &weapon;
 }
diff --git a/cpp01/ex06/HumanB.hpp b/cpp01/ex06/HumanB.hpp
index a01c881..269f4fc 100644
--- a/cpp01/ex06/HumanB.hpp
+++ b/cpp01/ex06/HumanB.hpp
@@ -6,7 +6,7 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/02/02 16:42:54 by cacharle          #+#    #+#             */
-/*   Updated: 2020/02/02 16:54:18 by cacharle         ###   ########.fr       */
+/*   Updated: 2020/04/13 10:23:31 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -18,13 +18,13 @@
 
 class HumanB
 {
-	private:
-		std::string name;
-		Weapon weapon;
-	public:
-		HumanB(std::string name);
-		void attack();
-		void setWeapon(Weapon weapon);
+public:
+    HumanB(std::string name);
+    void attack();
+    void setWeapon(Weapon& weapon);
+private:
+    std::string m_name;
+    Weapon* m_weapon;
 };
 
 #endif
diff --git a/cpp01/ex06/Weapon.cpp b/cpp01/ex06/Weapon.cpp
index 86738a8..e517947 100644
--- a/cpp01/ex06/Weapon.cpp
+++ b/cpp01/ex06/Weapon.cpp
@@ -6,23 +6,23 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/02/02 16:36:23 by cacharle          #+#    #+#             */
-/*   Updated: 2020/02/02 16:56:48 by cacharle         ###   ########.fr       */
+/*   Updated: 2020/04/13 10:25:35 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "Weapon.hpp"
 
-Weapon::Weapon(std::string type)
+Weapon::Weapon(std::string t)
+    : type(t)
 {
-	this->type = type;
 }
 
-const std::string& Weapon::getType()
+const std::string& Weapon::getType() const
 {
-	return &type;
+	return type;
 }
 
-void Weapon::setType(const std::string& type)
+void Weapon::setType(const std::string& t)
 {
-	this->type = type;
+	type = t;
 }
diff --git a/cpp01/ex06/Weapon.hpp b/cpp01/ex06/Weapon.hpp
index ea9b738..d9ad476 100644
--- a/cpp01/ex06/Weapon.hpp
+++ b/cpp01/ex06/Weapon.hpp
@@ -6,7 +6,7 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/02/02 16:34:31 by cacharle          #+#    #+#             */
-/*   Updated: 2020/02/02 16:56:40 by cacharle         ###   ########.fr       */
+/*   Updated: 2020/04/13 10:16:46 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -17,13 +17,13 @@
 
 class Weapon
 {
-	private:
-		std::string type;
+public:
+    Weapon(std::string t);
+    const std::string& getType() const;
+    void setType(const std::string& t);
 
-	public:
-		Weapon(std::string type);
-		const std::string& getType();
-		void setType(const std::string& type);
+private:
+    std::string type;  // subject want litteraly `type`
 };
 
 #endif