From 5274f7af177b9df1b54febd2ebc144ff06835474 Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 19 Apr 2018 17:35:57 +0200 Subject: Core/PacketIO: Added missing move assignment operator to ByteBuffer (cherry picked from commit fcb1e3e6424ef86934132e1111052a6798d78bc9) --- src/server/game/Entities/Creature/Creature.cpp | 9 +++------ src/server/game/Entities/GameObject/GameObject.cpp | 9 +++------ src/server/game/Quests/QuestDef.cpp | 9 +++------ 3 files changed, 9 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 012f6ceed72..4d1ad9ba5be 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -179,12 +179,8 @@ int32 CreatureTemplate::GetHealthScalingExpansion() const void CreatureTemplate::InitializeQueryData() { - WorldPacket queryTemp; for (uint8 loc = LOCALE_enUS; loc < TOTAL_LOCALES; ++loc) - { - queryTemp = BuildQueryData(static_cast(loc)); - QueryData[loc] = queryTemp; - } + QueryData[loc] = BuildQueryData(static_cast(loc)); } WorldPacket CreatureTemplate::BuildQueryData(LocaleConstant loc) const @@ -247,7 +243,8 @@ WorldPacket CreatureTemplate::BuildQueryData(LocaleConstant loc) const ObjectMgr::GetLocaleString(creatureLocale->TitleAlt, loc, stats.TitleAlt); } - return *queryTemp.Write(); + queryTemp.Write(); + return queryTemp.Move(); } CreatureLevelScaling const* CreatureTemplate::GetLevelScaling(Difficulty difficulty) const diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 4b7e2964b06..8d6941f635b 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -50,12 +50,8 @@ void GameObjectTemplate::InitializeQueryData() { - WorldPacket queryTemp; for (uint8 loc = LOCALE_enUS; loc < TOTAL_LOCALES; ++loc) - { - queryTemp = BuildQueryData(static_cast(loc)); - QueryData[loc] = queryTemp; - } + QueryData[loc] = BuildQueryData(static_cast(loc)); } WorldPacket GameObjectTemplate::BuildQueryData(LocaleConstant loc) const @@ -92,7 +88,8 @@ WorldPacket GameObjectTemplate::BuildQueryData(LocaleConstant loc) const memcpy(stats.Data, raw.data, MAX_GAMEOBJECT_DATA * sizeof(int32)); stats.ContentTuningId = ContentTuningId; - return *queryTemp.Write(); + queryTemp.Write(); + return queryTemp.Move(); } bool QuaternionData::isUnit() const diff --git a/src/server/game/Quests/QuestDef.cpp b/src/server/game/Quests/QuestDef.cpp index 07246cabeb6..b1df0ef8284 100644 --- a/src/server/game/Quests/QuestDef.cpp +++ b/src/server/game/Quests/QuestDef.cpp @@ -452,12 +452,8 @@ bool Quest::CanIncreaseRewardedQuestCounters() const void Quest::InitializeQueryData() { - WorldPacket queryTemp; for (uint8 loc = LOCALE_enUS; loc < TOTAL_LOCALES; ++loc) - { - queryTemp = BuildQueryData(static_cast(loc)); - QueryData[loc] = queryTemp; - } + QueryData[loc] = BuildQueryData(static_cast(loc)); } WorldPacket Quest::BuildQueryData(LocaleConstant loc) const @@ -597,7 +593,8 @@ WorldPacket Quest::BuildQueryData(LocaleConstant loc) const response.Info.AreaGroupID = GetAreaGroupID(); response.Info.TimeAllowed = GetLimitTime(); - return *response.Write(); + response.Write(); + return response.Move(); } uint32 Quest::RoundXPValue(uint32 xp) -- cgit v1.2.3