aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Entities/Item
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2020-06-27 13:33:17 +0200
committerShauren <shauren.trinity@gmail.com>2020-06-27 13:33:17 +0200
commitdeca201f7787f31187e2b9fab9cba7760313e786 (patch)
tree25c2b18ccd39760e2665a99c247980b606279e63 /src/server/game/Entities/Item
parenteccc015ce7c9d54cb79e113706ef028cfc34b144 (diff)
Core/DataStores: Simplified string memory allocation in db2 files, dropped unneccessary level of indirection
Diffstat (limited to 'src/server/game/Entities/Item')
-rw-r--r--src/server/game/Entities/Item/Item.cpp2
-rw-r--r--src/server/game/Entities/Item/ItemTemplate.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp
index 913d51d1f22..a2a98314834 100644
--- a/src/server/game/Entities/Item/Item.cpp
+++ b/src/server/game/Entities/Item/Item.cpp
@@ -503,7 +503,7 @@ std::string Item::GetNameForLocaleIdx(LocaleConstant locale) const
{
ItemTemplate const* itemTemplate = GetTemplate();
if (ItemNameDescriptionEntry const* suffix = sItemNameDescriptionStore.LookupEntry(_bonusData.Suffix))
- return Trinity::StringFormat("%s %s", itemTemplate->GetName(locale), suffix->Description->Str[locale]);
+ return Trinity::StringFormat("%s %s", itemTemplate->GetName(locale), suffix->Description[locale]);
return itemTemplate->GetName(locale);
}
diff --git a/src/server/game/Entities/Item/ItemTemplate.cpp b/src/server/game/Entities/Item/ItemTemplate.cpp
index 003382a2630..b43ff8d31c8 100644
--- a/src/server/game/Entities/Item/ItemTemplate.cpp
+++ b/src/server/game/Entities/Item/ItemTemplate.cpp
@@ -45,10 +45,10 @@ int32 const SocketColorToGemTypeMask[19] =
char const* ItemTemplate::GetName(LocaleConstant locale) const
{
- if (!strlen(ExtendedData->Display->Str[locale]))
+ if (!strlen(ExtendedData->Display[locale]))
return GetDefaultLocaleName();
- return ExtendedData->Display->Str[locale];
+ return ExtendedData->Display[locale];
}
@@ -112,7 +112,7 @@ uint32 ItemTemplate::GetSkill() const
char const* ItemTemplate::GetDefaultLocaleName() const
{
- return ExtendedData->Display->Str[sWorld->GetDefaultDbcLocale()];
+ return ExtendedData->Display[sWorld->GetDefaultDbcLocale()];
}
uint32 ItemTemplate::GetArmor(uint32 itemLevel) const