From 83f427368e12edbfb3ee25e75af9fabb0372efef Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Tue, 21 Apr 2020 14:44:57 +0200 Subject: [PATCH] Pass LearnedAttack list to creature by reference. --- src/Battling/Models/Creature.cpp | 5 +++-- src/Battling/Models/Creature.hpp | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Battling/Models/Creature.cpp b/src/Battling/Models/Creature.cpp index 984fc4c..6ea0ec5 100644 --- a/src/Battling/Models/Creature.cpp +++ b/src/Battling/Models/Creature.cpp @@ -9,10 +9,11 @@ using namespace CreatureLib; Battling::Creature::Creature(const BattleLibrary* library, const Library::CreatureSpecies* species, const Library::SpeciesVariant* variant, uint8_t level, uint32_t experience, uint32_t uid, Library::Gender gender, uint8_t coloring, const Library::Item* heldItem, - std::string nickname, const Library::TalentIndex& talent, List attacks) + std::string nickname, const Library::TalentIndex& talent, + const List& attacks) : _library(library), _species(species), _variant(variant), _level(level), _experience(experience), _uniqueIdentifier(uid), _gender(gender), _coloring(coloring), _heldItem(heldItem), _nickname(std::move(nickname)), - _talentIndex(talent), _hasOverridenTalent(false), _attacks(std::move(attacks)) { + _talentIndex(talent), _hasOverridenTalent(false), _attacks(attacks) { AssertNotNull(library) AssertNotNull(species) AssertNotNull(variant) diff --git a/src/Battling/Models/Creature.hpp b/src/Battling/Models/Creature.hpp index e826d28..9498a4f 100644 --- a/src/Battling/Models/Creature.hpp +++ b/src/Battling/Models/Creature.hpp @@ -64,7 +64,7 @@ namespace CreatureLib::Battling { Creature(const BattleLibrary* library, const Library::CreatureSpecies* species, const Library::SpeciesVariant* variant, uint8_t level, uint32_t experience, uint32_t uid, Library::Gender gender, uint8_t coloring, const Library::Item* heldItem, std::string nickname, - const Library::TalentIndex& talent, List attacks); + const Library::TalentIndex& talent, const List& attacks); virtual ~Creature() { for (auto attack : _attacks) { @@ -129,7 +129,7 @@ namespace CreatureLib::Battling { void RemoveVolatileScript(Script* script); bool HasVolatileScript(const ConstString& name) const; - List& GetAttacks() noexcept { return _attacks; } + const List& GetAttacks() noexcept { return _attacks; } const Library::CreatureSpecies* GetDisplaySpecies() const noexcept; const Library::SpeciesVariant* GetDisplayVariant() const noexcept;