diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-10-25 17:11:35 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-10-25 17:11:35 +0200 |
| commit | 10fb948c409e2e4a68b77b7cfc41c068fcbd0bf4 (patch) | |
| tree | eb6520c7e28aed4ffd660b7af15ce8592e4d30c2 /src/server/game/Entities | |
| parent | 5eb9fe1ea8653c7ae23e4a8c2fa9f8f3073e032d (diff) | |
Core/Entities: Changed a few lowguid uses to ObjectGuid::LowType
Diffstat (limited to 'src/server/game/Entities')
| -rw-r--r-- | src/server/game/Entities/Object/ObjectGuid.h | 1 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/server/game/Entities/Object/ObjectGuid.h b/src/server/game/Entities/Object/ObjectGuid.h index 6f10d62d0d8..988c1847e7d 100644 --- a/src/server/game/Entities/Object/ObjectGuid.h +++ b/src/server/game/Entities/Object/ObjectGuid.h @@ -104,6 +104,7 @@ class ObjectGuid std::vector<uint8> GetRawValue() const; void SetRawValue(std::vector<uint8> const& guid); + void SetRawValue(uint64 high, uint64 low) { _high = high; _low = low; } void Clear() { _low = 0; } PackedGuid WriteAsPacked() const; diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 2b03d8f59fa..29a5abb767d 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -5434,7 +5434,7 @@ uint32 Player::DurabilityRepair(uint16 pos, bool cost, float discountMod, bool g if (guildBank) { - if (GetGuildId() == 0) + if (!GetGuildId()) { TC_LOG_DEBUG("entities.player.items", "You are not member of a guild"); return TotalCost; @@ -26413,6 +26413,8 @@ void Player::BuildEnchantmentsInfoData(WorldPacket* data) void Player::SendEquipmentSetList() { + ObjectGuid ignoredItemGuid; + ignoredItemGuid.SetRawValue(0, 1); uint32 count = 0; WorldPacket data(SMSG_EQUIPMENT_SET_LIST, 4); size_t count_pos = data.wpos(); @@ -26429,7 +26431,7 @@ void Player::SendEquipmentSetList() { // ignored slots stored in IgnoreMask, client wants "1" as raw GUID, so no HIGHGUID_ITEM if (itr->second.IgnoreMask & (1 << i)) - data << ObjectGuid(uint64(0), uint64(1)); + data << ignoredItemGuid; else data << ObjectGuid(HIGHGUID_ITEM, itr->second.Items[i]); } |