diff --git a/Personnage/Personnage.cpp b/Personnage/Personnage.cpp index 3a4c43e..2eacbb3 100644 --- a/Personnage/Personnage.cpp +++ b/Personnage/Personnage.cpp @@ -8,7 +8,7 @@ using namespace std; void Personnage::parler(const string &message) const { - cout << message << endl; + cout << m_name << ":\n\t" << message << endl; } Personnage::Personnage(const std::string &name, @@ -21,5 +21,10 @@ const string &Personnage::name() const return m_name; } +const int &Personnage::hp() const +{ + return m_hp; +} + Personnage::~Personnage() = default; diff --git a/Personnage/Personnage.h b/Personnage/Personnage.h index 5913f51..752b26c 100644 --- a/Personnage/Personnage.h +++ b/Personnage/Personnage.h @@ -16,6 +16,7 @@ public: virtual void parler(const std::string &message) const; const std::string &name() const; + const int &hp() const; explicit Personnage(const std::string &name = "FNU", const int &hp = 10); diff --git a/main.cpp b/main.cpp index 812fbac..f6fff54 100644 --- a/main.cpp +++ b/main.cpp @@ -94,7 +94,7 @@ int main() delete kyle; auto *otherKenny = new Kenny("Kenny", 18); - anime.push_front(otherKenny); + anime.push_back(otherKenny); for (Personnage *character: anime) { @@ -122,10 +122,22 @@ int main() for (Personnage *character: anime) { - cout << character->name() << ":\n\t"; character->parler("I survived"); } + string name = "aziudga"; + for (int i = 0; i < 10; ++i) + { + name += std::to_string(i); + anime.push_back(new Personnage(name, int(name.length()))); + } + + for (Personnage *character: anime) + { + character->parler("sup"); + cout << character->hp() << " HP" << endl; + } + for (auto character: anime) delete character; return 0;