aboutsummaryrefslogtreecommitdiff
path: root/cpp04/ex01/Character.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp04/ex01/Character.cpp')
-rw-r--r--cpp04/ex01/Character.cpp40
1 files changed, 13 insertions, 27 deletions
diff --git a/cpp04/ex01/Character.cpp b/cpp04/ex01/Character.cpp
index e06be50..5f865c7 100644
--- a/cpp04/ex01/Character.cpp
+++ b/cpp04/ex01/Character.cpp
@@ -6,29 +6,26 @@
/* By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2020/04/14 13:44:35 by charles #+# #+# */
-/* Updated: 2020/04/14 14:13:39 by charles ### ########.fr */
+/* Updated: 2020/11/12 14:28:26 by cacharle ### ########.fr */
/* */
/* ************************************************************************** */
#include "Character.hpp"
-Character::Character(Character const& other)
-{
- *this = other;
-}
+Character::Character(std::string const& name) :
+ m_name(name), m_ap(40), m_weapon(NULL) {}
-void Character::operator=(Character const& other)
-{
- m_name = other.m_name;
-}
+Character::Character(Character const& other) { *this = other; }
-Character::~Character()
+Character& Character::operator=(Character const& other)
{
+ m_name = other.m_name;
+ m_ap = other.m_ap;
+ m_weapon = other.m_weapon;
+ return *this;
}
-Character::Character(std::string const& name) : m_name(name), m_ap(40), m_weapon(NULL)
-{
-}
+Character::~Character() {}
void Character::recoverAP()
{
@@ -54,20 +51,9 @@ void Character::attack(Enemy *enemy)
m_ap -= m_weapon->getAPCost();
}
-std::string const& Character::getName() const
-{
- return m_name;
-}
-
-int Character::getAP() const
-{
- return m_ap;
-}
-
-AWeapon* Character::getWeapon() const
-{
- return m_weapon;
-}
+std::string const& Character::getName() const { return m_name; }
+int Character::getAP() const { return m_ap; }
+AWeapon* Character::getWeapon() const { return m_weapon; }
std::ostream& operator<<(std::ostream& out, Character const& c)
{