From b60a8b209528129a5bf74a0d03c3d5e424fe7adb Mon Sep 17 00:00:00 2001 From: ModoX Date: Tue, 9 Apr 2024 17:00:43 +0200 Subject: Core/Entities: nopch build fix (cherry picked from commit 58839b7c18f4d0662ee407887ec1323040420d5a) --- src/server/game/Entities/Creature/Creature.h | 2 +- src/server/game/Entities/GameObject/GameObject.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server') diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index 848b6ae7f2e..e03ad96095d 100644 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -247,7 +247,7 @@ class TC_GAME_API Creature : public Unit, public GridObject, public Ma bool HasStringId(std::string_view id) const; void SetScriptStringId(std::string id); std::array const& GetStringIds() const { return m_stringIds; } - std::string_view const& GetStringId(StringIdType type) const { return m_stringIds[AsUnderlyingType(type)]; } + std::string_view GetStringId(StringIdType type) const { return m_stringIds[size_t(type)]; } // override WorldObject function for proper name localization std::string GetNameForLocaleIdx(LocaleConstant locale) const override; diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h index 7cc72dd92c9..13b8afdd5ad 100644 --- a/src/server/game/Entities/GameObject/GameObject.h +++ b/src/server/game/Entities/GameObject/GameObject.h @@ -381,7 +381,7 @@ class TC_GAME_API GameObject : public WorldObject, public GridObject bool HasStringId(std::string_view id) const; void SetScriptStringId(std::string id); std::array const& GetStringIds() const { return m_stringIds; } - std::string_view const& GetStringId(StringIdType type) const { return m_stringIds[AsUnderlyingType(type)]; } + std::string_view GetStringId(StringIdType type) const { return m_stringIds[size_t(type)]; } void SetDisplayId(uint32 displayid); uint32 GetDisplayId() const { return m_gameObjectData->DisplayID; } -- cgit v1.2.3