From be82abeece36b96fcd35336d3510534412805ad0 Mon Sep 17 00:00:00 2001
From: Deukhoofd <deukhoofd@gmail.com>
Date: Sun, 19 Jul 2020 12:15:14 +0200
Subject: [PATCH] Change nickname to string from string_view.

---
 CInterface/Battling/Creature.cpp | 2 +-
 src/Battling/Models/Creature.cpp | 2 +-
 src/Battling/Models/Creature.hpp | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CInterface/Battling/Creature.cpp b/CInterface/Battling/Creature.cpp
index 65f6ca4..f1fdbc2 100644
--- a/CInterface/Battling/Creature.cpp
+++ b/CInterface/Battling/Creature.cpp
@@ -12,7 +12,7 @@ export uint8_t CreatureLib_Creature_Construct(Creature*& out, const BattleLibrar
     Try(auto attacksVec = std::vector<LearnedAttack*>(attacks, attacks + (attacksNum * sizeof(LearnedAttack*)));
         out = new Creature(library, ArbUt::BorrowedPtr<const CreatureLib::Library::CreatureSpecies>(species), variant,
                            level, experience, uid, gender, coloring,
-                           ArbUt::BorrowedPtr<const CreatureLib::Library::Item>(heldItem), nickname,
+                           ArbUt::BorrowedPtr<const CreatureLib::Library::Item>(heldItem), std::string(nickname),
                            CreatureLib::Library::TalentIndex(secretTalent, talent), attacksVec, allowedExperienceGain);)
 };
 
diff --git a/src/Battling/Models/Creature.cpp b/src/Battling/Models/Creature.cpp
index 4bc286f..6dc53a0 100644
--- a/src/Battling/Models/Creature.cpp
+++ b/src/Battling/Models/Creature.cpp
@@ -10,7 +10,7 @@ Battling::Creature::Creature(ArbUt::BorrowedPtr<const BattleLibrary> library,
                              const ArbUt::BorrowedPtr<const Library::CreatureSpecies>& species,
                              const ArbUt::BorrowedPtr<const Library::SpeciesVariant>& variant, uint8_t level,
                              uint32_t experience, uint32_t uid, Library::Gender gender, uint8_t coloring,
-                             const ArbUt::BorrowedPtr<const Library::Item> heldItem, const std::string_view& nickname,
+                             const ArbUt::BorrowedPtr<const Library::Item> heldItem, const std::string& nickname,
                              const Library::TalentIndex& talent, const std::vector<LearnedAttack*>& attacks,
                              bool allowedExperienceGain)
     : _library(library), _species(species), _variant(variant), _level(level), _experience(experience),
diff --git a/src/Battling/Models/Creature.hpp b/src/Battling/Models/Creature.hpp
index ab14354..2e24cdf 100644
--- a/src/Battling/Models/Creature.hpp
+++ b/src/Battling/Models/Creature.hpp
@@ -45,7 +45,7 @@ namespace CreatureLib::Battling {
         ArbUt::BorrowedPtr<BattleSide> _side = nullptr;
         bool _onBattleField = false;
 
-        std::string_view _nickname = "";
+        std::string _nickname = "";
         CreatureLib::Library::TalentIndex _talentIndex;
         std::unique_ptr<Script> _activeTalent = nullptr;
 
@@ -69,7 +69,7 @@ namespace CreatureLib::Battling {
                  const ArbUt::BorrowedPtr<const Library::CreatureSpecies>& species,
                  const ArbUt::BorrowedPtr<const Library::SpeciesVariant>& variant, uint8_t level, uint32_t experience,
                  uint32_t uid, Library::Gender gender, uint8_t coloring,
-                 const ArbUt::BorrowedPtr<const Library::Item> heldItem, const std::string_view& nickname,
+                 const ArbUt::BorrowedPtr<const Library::Item> heldItem, const std::string& nickname,
                  const Library::TalentIndex& talent, const std::vector<LearnedAttack*>& attacks,
                  bool allowedExperienceGain = true);
 
@@ -108,7 +108,7 @@ namespace CreatureLib::Battling {
         inline void SetOnBattleField(bool value) { _onBattleField = value; }
         inline bool IsOnBattleField() const { return _onBattleField; }
 
-        inline const std::string_view& GetNickname() const noexcept { return _nickname; }
+        inline std::string_view GetNickname() const noexcept { return _nickname; }
         const ArbUt::StringView& GetActiveTalent() const;
 
         [[nodiscard]] bool IsFainted() const noexcept;