diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-10-23 17:01:26 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-10-23 17:01:26 +0200 |
| commit | 08c56eb1109aed2c6dabe728c945d4afd4943753 (patch) | |
| tree | 27c73ebb9fcf30c3a7fd08fef6d58a6f4a585190 /src/server/game/Handlers/CharacterHandler.cpp | |
| parent | ff781978a56b33567d704a860a94e5e28a53aee4 (diff) | |
Core/Entities: First step to 128 bit guids
* Database fields storing full guid have been converted to BINARY(16)
Diffstat (limited to 'src/server/game/Handlers/CharacterHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/CharacterHandler.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp index 24a39f53444..d20aa950d3e 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp @@ -1534,7 +1534,7 @@ void WorldSession::HandleEquipmentSetSave(WorldPacket& recvData) TC_LOG_DEBUG("network", "CMSG_EQUIPMENT_SET_SAVE"); uint64 setGuid; - recvData.readPackGUID(setGuid); + recvData.ReadPackedUInt64(setGuid); uint32 index; recvData >> index; @@ -1560,7 +1560,7 @@ void WorldSession::HandleEquipmentSetSave(WorldPacket& recvData) recvData >> itemGuid.ReadAsPacked(); // equipment manager sends "1" (as raw GUID) for slots set to "ignore" (don't touch slot at equip set) - if (itemGuid.GetRawValue() == 1) + if (itemGuid == ObjectGuid(uint64(0), uint64(1))) { // ignored slots saved as bit mask because we have no free special values for Items[i] eqSet.IgnoreMask |= 1 << i; @@ -1586,7 +1586,7 @@ void WorldSession::HandleEquipmentSetDelete(WorldPacket& recvData) TC_LOG_DEBUG("network", "CMSG_EQUIPMENT_SET_DELETE"); uint64 setGuid; - recvData.readPackGUID(setGuid); + recvData.ReadPackedUInt64(setGuid); _player->DeleteEquipmentSet(setGuid); } @@ -1606,7 +1606,7 @@ void WorldSession::HandleEquipmentSetUse(WorldPacket& recvData) TC_LOG_DEBUG("entities.player.items", "%s: srcbag %u, srcslot %u", itemGuid.ToString().c_str(), srcbag, srcslot); // check if item slot is set to "ignored" (raw value == 1), must not be unequipped then - if (itemGuid.GetRawValue() == 1) + if (itemGuid == ObjectGuid(uint64(0), uint64(1))) continue; // Only equip weapons in combat |