From 0f3240844dbd5a874e1565a988ef355ededab6a5 Mon Sep 17 00:00:00 2001 From: Charles Date: Mon, 13 Apr 2020 10:33:05 +0200 Subject: Fixing cpp01 --- cpp01/ex03/ZombieHorde.cpp | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) (limited to 'cpp01/ex03/ZombieHorde.cpp') diff --git a/cpp01/ex03/ZombieHorde.cpp b/cpp01/ex03/ZombieHorde.cpp index e8218b4..955355b 100644 --- a/cpp01/ex03/ZombieHorde.cpp +++ b/cpp01/ex03/ZombieHorde.cpp @@ -1,7 +1,19 @@ -#include +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ZombieHorde.cpp :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: charles +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/04/13 09:52:11 by charles #+# #+# */ +/* Updated: 2020/04/13 10:02:01 by charles ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include "ZombieHorde.hpp" -ZombieHorde::ZombieHorde(int size) +ZombieHorde::ZombieHorde(int n) + : m_size(n) { std::string name_pool[10] = { "Jordan", @@ -21,21 +33,20 @@ ZombieHorde::ZombieHorde(int size) "earth", "wind" }; - horde = new Zombie*[size]; - horde_size = size; - for (int i = 0; i < size; i++) - horde[i] = new Zombie(name_pool[rand() % 10], type_pool[rand() % 4]); + m_horde = new Zombie*[m_size]; + for (size_t i = 0; i < m_size; i++) + m_horde[i] = new Zombie(name_pool[rand() % 10], type_pool[rand() % 4]); } ZombieHorde::~ZombieHorde() { - for (int i = 0; i < horde_size; i++) - delete horde[i]; - delete [] horde; + for (size_t i = 0; i < m_size; i++) + delete m_horde[i]; + delete [] m_horde; } void ZombieHorde::announce() { - for (int i = 0; i < horde_size; i++) - horde[i]->announce(); + for (size_t i = 0; i < m_size; i++) + m_horde[i]->announce(); } -- cgit