diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-05-19 17:13:27 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2015-05-19 17:13:27 +0200 |
| commit | dd4549cec9f011fd7be3a1c15de0a58ef65892f1 (patch) | |
| tree | 0894fe122595653ea2f933e9a2879b04c99dc71c /src/server/game/Server | |
| parent | 7382c7d5d3ecfce7ae8d59390ba3ffa17eea81a9 (diff) | |
Core/Garrisons: Improved follower ability selection to include exclusive trait flag
Diffstat (limited to 'src/server/game/Server')
| -rw-r--r-- | src/server/game/Server/Packets/GarrisonPackets.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Server/Packets/GarrisonPackets.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Server/Packets/GarrisonPackets.cpp b/src/server/game/Server/Packets/GarrisonPackets.cpp index 456149bbdbb..88374e7ce62 100644 --- a/src/server/game/Server/Packets/GarrisonPackets.cpp +++ b/src/server/game/Server/Packets/GarrisonPackets.cpp @@ -60,8 +60,8 @@ ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Garrison::GarrisonFollowe data << uint32(follower.CurrentMissionID); data << uint32(follower.AbilityID.size()); data << uint32(follower.FollowerStatus); - for (uint32 abilityId : follower.AbilityID) - data << uint32(abilityId); + for (GarrAbilityEntry const* ability : follower.AbilityID) + data << uint32(ability->ID); return data; } diff --git a/src/server/game/Server/Packets/GarrisonPackets.h b/src/server/game/Server/Packets/GarrisonPackets.h index 5fc386ab72b..5c7af650e29 100644 --- a/src/server/game/Server/Packets/GarrisonPackets.h +++ b/src/server/game/Server/Packets/GarrisonPackets.h @@ -74,7 +74,7 @@ namespace WorldPackets uint32 Xp = 0; uint32 CurrentBuildingID = 0; uint32 CurrentMissionID = 0; - std::list<uint32> AbilityID; + std::list<GarrAbilityEntry const*> AbilityID; uint32 FollowerStatus; }; |
