diff options
| author | Charles Cabergs <me@cacharle.xyz> | 2020-11-17 09:36:17 +0100 |
|---|---|---|
| committer | Charles Cabergs <me@cacharle.xyz> | 2020-11-17 09:36:17 +0100 |
| commit | 4eecb32ffcf48c42672782fbcd53781a22e95ebf (patch) | |
| tree | cef35987dc325ed2f0a8e5085f9e7a18554367fe /cpp04/ex03/MateriaSource.cpp | |
| parent | 62be117da22b5159c8712537ac7ef135ff3007b8 (diff) | |
| download | piscine_cpp-4eecb32ffcf48c42672782fbcd53781a22e95ebf.tar.gz piscine_cpp-4eecb32ffcf48c42672782fbcd53781a22e95ebf.tar.bz2 piscine_cpp-4eecb32ffcf48c42672782fbcd53781a22e95ebf.zip | |
Added cpp04/ex03 main
Diffstat (limited to 'cpp04/ex03/MateriaSource.cpp')
| -rw-r--r-- | cpp04/ex03/MateriaSource.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/cpp04/ex03/MateriaSource.cpp b/cpp04/ex03/MateriaSource.cpp index 0d21ab8..6747a93 100644 --- a/cpp04/ex03/MateriaSource.cpp +++ b/cpp04/ex03/MateriaSource.cpp @@ -6,13 +6,14 @@ /* By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/04/14 17:19:10 by charles #+# #+# */ -/* Updated: 2020/11/15 17:22:19 by charles ### ########.fr */ +/* Updated: 2020/11/17 08:32:37 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ #include "MateriaSource.hpp" -MateriaSource::MateriaSource() : m_learned_size(0) {} +MateriaSource::MateriaSource() + : m_learned_size(0) {} MateriaSource::MateriaSource(MateriaSource const& other) : m_learned_size(0) { *this = other; } @@ -30,9 +31,12 @@ MateriaSource::~MateriaSource() { destroyLearned(); } void MateriaSource::learnMateria(AMateria* materia) { - if (m_learned_size >= 4 || materia == NULL) + if (m_learned_size >= LEARNED_MAX_SIZE || materia == NULL) + { + delete materia; return; - m_learned[m_learned_size] = materia->clone(); + } + m_learned[m_learned_size] = materia; m_learned_size++; } |
