diff options
| author | Meji <alvaromegias_46@hotmail.com> | 2021-10-16 12:15:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-16 12:15:03 +0200 |
| commit | 11cc5c0d3bd46b5e68bb549625ef9ca7294deb21 (patch) | |
| tree | b36f19d80b39158bf4a0cadf38a9398beb08194a /src/server/game/Server | |
| parent | d07102a3dabcdde28f1bb2d504a338f705eb3141 (diff) | |
Core/BattlePets: Misc fixes (#27057)
* Rename WorldPackets::BattlePet::BattlePet::CollarID to WorldPackets::BattlePet::BattlePet::DisplayID
* Use the DisplayID field to store the model of the battle pet. If the species has BattlePetSpeciesFlags::RandomDisplay, nothing is stored. Otherwise a random model is chosen from those available
* Stored DisplayID in ITEM_MODIFIER_BATTLE_PET_DISPLAY_ID when caging the battle pet (previously the CreatureID was being stored)
* Modified SendPlaySpellVisual function to allow sending Target and TargetPosition at the same time
* Added SpellVisual when uncaging
Diffstat (limited to 'src/server/game/Server')
| -rw-r--r-- | src/server/game/Server/Packets/BattlePetPackets.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Server/Packets/BattlePetPackets.h | 2 | ||||
| -rw-r--r-- | src/server/game/Server/Packets/SpellPackets.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Server/Packets/BattlePetPackets.cpp b/src/server/game/Server/Packets/BattlePetPackets.cpp index d1a7b9eebbf..bd210798e7f 100644 --- a/src/server/game/Server/Packets/BattlePetPackets.cpp +++ b/src/server/game/Server/Packets/BattlePetPackets.cpp @@ -33,7 +33,7 @@ ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::BattlePet::BattlePet cons data << pet.Guid; data << uint32(pet.Species); data << uint32(pet.CreatureID); - data << uint32(pet.CollarID); + data << uint32(pet.DisplayID); data << uint16(pet.Breed); data << uint16(pet.Level); data << uint16(pet.Exp); @@ -45,7 +45,7 @@ ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::BattlePet::BattlePet cons data << uint8(pet.Quality); data.WriteBits(pet.Name.size(), 7); data.WriteBit(pet.OwnerInfo.is_initialized()); - data.WriteBit(pet.Name.empty()); // NoRename + data.WriteBit(false); // NoRename data.FlushBits(); data.WriteString(pet.Name); diff --git a/src/server/game/Server/Packets/BattlePetPackets.h b/src/server/game/Server/Packets/BattlePetPackets.h index 3dce500d0cc..2ae7c9a99ce 100644 --- a/src/server/game/Server/Packets/BattlePetPackets.h +++ b/src/server/game/Server/Packets/BattlePetPackets.h @@ -39,7 +39,7 @@ namespace WorldPackets ObjectGuid Guid; uint32 Species = 0; uint32 CreatureID = 0; - uint32 CollarID = 0; + uint32 DisplayID = 0; uint16 Breed = 0; uint16 Level = 0; uint16 Exp = 0; diff --git a/src/server/game/Server/Packets/SpellPackets.h b/src/server/game/Server/Packets/SpellPackets.h index 349e62473dc..02d0a9bdb39 100644 --- a/src/server/game/Server/Packets/SpellPackets.h +++ b/src/server/game/Server/Packets/SpellPackets.h @@ -743,9 +743,9 @@ namespace WorldPackets WorldPacket const* Write() override; ObjectGuid Source; - ObjectGuid Target; // Exclusive with TargetPosition + ObjectGuid Target; ObjectGuid Transport; // Used when Target = Empty && (SpellVisual::Flags & 0x400) == 0 - TaggedPosition<Position::XYZ> TargetPosition; // Exclusive with Target + TaggedPosition<Position::XYZ> TargetPosition; // Overrides missile destination for SpellVisual::SpellVisualMissileSetID uint32 SpellVisualID = 0; float TravelSpeed = 0.0f; uint16 HitReason = 0; |