From deca201f7787f31187e2b9fab9cba7760313e786 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 27 Jun 2020 13:33:17 +0200 Subject: Core/DataStores: Simplified string memory allocation in db2 files, dropped unneccessary level of indirection --- src/server/game/Entities/Item/Item.cpp | 2 +- src/server/game/Entities/Item/ItemTemplate.cpp | 6 +++--- src/server/game/Entities/Pet/Pet.cpp | 4 ++-- src/server/game/Entities/Player/Player.cpp | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/server/game/Entities') 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 diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index bb6d87b2072..04349d64a9a 100644 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -718,7 +718,7 @@ bool Pet::CreateBaseAtCreature(Creature* creature) SetDisplayId(creature->GetDisplayId()); if (CreatureFamilyEntry const* cFamily = sCreatureFamilyStore.LookupEntry(cinfo->family)) - SetName(cFamily->Name->Str[GetOwner()->GetSession()->GetSessionDbcLocale()]); + SetName(cFamily->Name[GetOwner()->GetSession()->GetSessionDbcLocale()]); else SetName(creature->GetNameForLocaleIdx(sObjectMgr->GetDBCLocaleIndex())); @@ -731,7 +731,7 @@ bool Pet::CreateBaseAtCreatureInfo(CreatureTemplate const* cinfo, Unit* owner) return false; if (CreatureFamilyEntry const* cFamily = sCreatureFamilyStore.LookupEntry(cinfo->family)) - SetName(cFamily->Name->Str[GetOwner()->GetSession()->GetSessionDbcLocale()]); + SetName(cFamily->Name[GetOwner()->GetSession()->GetSessionDbcLocale()]); Relocate(owner->GetPositionX(), owner->GetPositionY(), owner->GetPositionZ(), owner->GetOrientation()); diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 6ed5ecd5dbd..22336c85617 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -19796,7 +19796,7 @@ void Player::_LoadBoundInstances(PreparedQueryResult result) bool deleteInstance = false; MapEntry const* mapEntry = sMapStore.LookupEntry(mapId); - std::string mapname = mapEntry ? mapEntry->MapName->Str[sWorld->GetDefaultDbcLocale()] : "Unknown"; + std::string mapname = mapEntry ? mapEntry->MapName[sWorld->GetDefaultDbcLocale()] : "Unknown"; if (!mapEntry || !mapEntry->IsDungeon()) { @@ -20116,7 +20116,7 @@ bool Player::Satisfy(AccessRequirement const* ar, uint32 target_map, bool report { if (missingQuest && !ar->questFailedText.empty()) ChatHandler(GetSession()).PSendSysMessage("%s", ar->questFailedText.c_str()); - else if (mapDiff->Message->Str[sWorld->GetDefaultDbcLocale()][0] != '\0') // if (missingAchievement) covered by this case + else if (mapDiff->Message[sWorld->GetDefaultDbcLocale()][0] != '\0') // if (missingAchievement) covered by this case SendTransferAborted(target_map, TRANSFER_ABORT_DIFFICULTY, target_difficulty); else if (missingItem) GetSession()->SendNotification(GetSession()->GetTrinityString(LANG_LEVEL_MINREQUIRED_AND_ITEM), LevelMin, ASSERT_NOTNULL(sObjectMgr->GetItemTemplate(missingItem))->GetName(GetSession()->GetSessionDbcLocale())); @@ -28088,9 +28088,9 @@ std::string Player::GetMapAreaAndZoneString() const std::string zoneName = "Unknown"; if (AreaTableEntry const* area = sAreaTableStore.LookupEntry(areaId)) { - areaName = area->AreaName->Str[GetSession()->GetSessionDbcLocale()]; + areaName = area->AreaName[GetSession()->GetSessionDbcLocale()]; if (AreaTableEntry const* zone = sAreaTableStore.LookupEntry(area->ParentAreaID)) - zoneName = zone->AreaName->Str[GetSession()->GetSessionDbcLocale()]; + zoneName = zone->AreaName[GetSession()->GetSessionDbcLocale()]; } std::ostringstream str; -- cgit v1.2.3