diff options
| author | Shauren <shauren.trinity@gmail.com> | 2018-04-19 17:35:57 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2018-04-19 17:35:57 +0200 |
| commit | fcb1e3e6424ef86934132e1111052a6798d78bc9 (patch) | |
| tree | 2a91c03ca83d8c3912a3af7683d34455f9a2a12c /src/server/game/Entities | |
| parent | 6d069b631fb592ebf37993d7f4e65f8a4b051823 (diff) | |
Core/PacketIO: Added missing move assignment operator to ByteBuffer
Diffstat (limited to 'src/server/game/Entities')
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.cpp | 9 | ||||
| -rw-r--r-- | src/server/game/Entities/GameObject/GameObject.cpp | 9 | ||||
| -rw-r--r-- | src/server/game/Entities/Item/ItemTemplate.cpp | 9 |
3 files changed, 9 insertions, 18 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 7d7c1ae6f4d..03f00efe738 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -172,12 +172,8 @@ uint32 CreatureTemplate::GetFirstVisibleModel() const void CreatureTemplate::InitializeQueryData() { - WorldPacket queryTemp; for (uint8 loc = LOCALE_enUS; loc < TOTAL_LOCALES; ++loc) - { - queryTemp = BuildQueryData(static_cast<LocaleConstant>(loc)); - QueryData[loc] = queryTemp; - } + QueryData[loc] = BuildQueryData(static_cast<LocaleConstant>(loc)); } WorldPacket CreatureTemplate::BuildQueryData(LocaleConstant loc) const @@ -219,7 +215,8 @@ WorldPacket CreatureTemplate::BuildQueryData(LocaleConstant loc) const queryTemp.Stats.QuestItems[i] = (*items)[i]; queryTemp.Stats.CreatureMovementInfoID = movementId; - return *queryTemp.Write(); + queryTemp.Write(); + return queryTemp.Move(); } bool AssistDelayEvent::Execute(uint64 /*e_time*/, uint32 /*p_time*/) diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index b85e352c12f..95579847ce9 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -44,12 +44,8 @@ void GameObjectTemplate::InitializeQueryData() { - WorldPacket queryTemp; for (uint8 loc = LOCALE_enUS; loc < TOTAL_LOCALES; ++loc) - { - queryTemp = BuildQueryData(static_cast<LocaleConstant>(loc)); - QueryData[loc] = queryTemp; - } + QueryData[loc] = BuildQueryData(static_cast<LocaleConstant>(loc)); } WorldPacket GameObjectTemplate::BuildQueryData(LocaleConstant loc) const @@ -86,7 +82,8 @@ WorldPacket GameObjectTemplate::BuildQueryData(LocaleConstant loc) const if (i < items->size()) queryTemp.Stats.QuestItems[i] = (*items)[i]; - return *queryTemp.Write(); + queryTemp.Write(); + return queryTemp.Move(); } bool QuaternionData::isUnit() const diff --git a/src/server/game/Entities/Item/ItemTemplate.cpp b/src/server/game/Entities/Item/ItemTemplate.cpp index 7c0ccac7bd5..318df777859 100644 --- a/src/server/game/Entities/Item/ItemTemplate.cpp +++ b/src/server/game/Entities/Item/ItemTemplate.cpp @@ -149,12 +149,8 @@ void ItemTemplate::_LoadTotalAP() void ItemTemplate::InitializeQueryData() { - WorldPacket queryTemp; for (uint8 loc = LOCALE_enUS; loc < TOTAL_LOCALES; ++loc) - { - queryTemp = BuildQueryData(static_cast<LocaleConstant>(loc)); - QueryData[loc] = queryTemp; - } + QueryData[loc] = BuildQueryData(static_cast<LocaleConstant>(loc)); } WorldPacket ItemTemplate::BuildQueryData(LocaleConstant loc) const @@ -270,5 +266,6 @@ WorldPacket ItemTemplate::BuildQueryData(LocaleConstant loc) const response.Stats.ItemLimitCategory = ItemLimitCategory; response.Stats.HolidayId = HolidayId; - return *response.Write(); + response.Write(); + return response.Move(); } |