Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 18:15:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15510 from horn/6.x

Browse Source 
Core/BattlePets: Added missing casts in packets and forgotten state from BattlePetSpeciesState.db2
This commit is contained in:
MitchesD
2015-09-14 20:51:52 +02:00
parent 9e31bb0cbf 14e4c52c3b
commit 64ec9299e5
3 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/game/BattlePets/BattlePetMgr.h
View File

@@ -29,7 +29,7 @@ enum BattlePetMisc
DEFAULT_SUMMON_BATTLE_PET_SPELL = 118301
};
// TODO: fix values in this enum
// TODO: fix undefined values in this enum
enum BattlePetError
{
BATTLEPETRESULT_CANT_HAVE_MORE_PETS_OF_THAT_TYPE = 9,
@@ -67,7 +67,9 @@ enum BattlePetState
STATE_COSMETIC_TREASURE_GOBLIN = 176,
// these are not in BattlePetState.db2 but are used in BattlePetSpeciesState.db2
STATE_START_WITH_BUFF = 183,
STATE_START_WITH_BUFF_2 = 184
STATE_START_WITH_BUFF_2 = 184,
//
STATE_COSMETIC_SPECTRAL_BLUE = 196
};
enum BattlePetSaveInfo

42
src/server/game/Server/Packets/BattlePetPackets.cpp
View File

@@ -21,8 +21,8 @@
ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::BattlePet::BattlePetSlot const& slot)
{
data << (slot.Pet.Guid.IsEmpty() ? ObjectGuid::Create<HighGuid::BattlePet>(0) : slot.Pet.Guid);
data << slot.CollarID;
data << slot.Index;
data << uint32(slot.CollarID);
data << uint8(slot.Index);
data.WriteBit(slot.Locked);
data.FlushBits();
@@ -32,18 +32,18 @@ ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::BattlePet::BattlePetSlot
ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::BattlePet::BattlePet const& pet)
{
data << pet.Guid;
data << pet.Species;
data << pet.CreatureID;
data << pet.CollarID;
data << pet.Breed;
data << pet.Level;
data << pet.Exp;
data << pet.Flags;
data << pet.Power;
data << pet.Health;
data << pet.MaxHealth;
data << pet.Speed;
data << pet.Quality;
data << uint32(pet.Species);
data << uint32(pet.CreatureID);
data << uint32(pet.CollarID);
data << uint16(pet.Breed);
data << uint16(pet.Level);
data << uint16(pet.Exp);
data << uint16(pet.Flags);
data << uint32(pet.Power);
data << uint32(pet.Health);
data << uint32(pet.MaxHealth);
data << uint32(pet.Speed);
data << uint8(pet.Quality);
data.WriteBits(pet.Name.size(), 7);
data.WriteBit(!pet.Owner.IsEmpty()); // HasOwnerInfo
data.WriteBit(pet.Name.empty()); // NoRename
@@ -52,8 +52,8 @@ ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::BattlePet::BattlePet cons
if (!pet.Owner.IsEmpty())
{
data << pet.Owner;
data << GetVirtualRealmAddress(); // Virtual
data << GetVirtualRealmAddress(); // Native
data << uint32(GetVirtualRealmAddress()); // Virtual
data << uint32(GetVirtualRealmAddress()); // Native
}
data.WriteString(pet.Name);
@@ -63,9 +63,9 @@ ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::BattlePet::BattlePet cons
WorldPacket const* WorldPackets::BattlePet::BattlePetJournal::Write()
{
_worldPacket << Trap;
_worldPacket << Slots.size();
_worldPacket << Pets.size();
_worldPacket << uint16(Trap);
_worldPacket << uint32(Slots.size());
_worldPacket << uint32(Pets.size());
for (auto const& slot : Slots)
_worldPacket << slot;
@@ -73,7 +73,7 @@ WorldPacket const* WorldPackets::BattlePet::BattlePetJournal::Write()
for (auto const& pet : Pets)
_worldPacket << pet;
_worldPacket.WriteBit(1); // HasJournalLock
_worldPacket.WriteBit(HasJournalLock);
_worldPacket.FlushBits();
return &_worldPacket;
@@ -160,7 +160,7 @@ WorldPacket const* WorldPackets::BattlePet::BattlePetError::Write()
{
_worldPacket.WriteBits(Result, 4);
_worldPacket.FlushBits();
_worldPacket << CreatureID;
_worldPacket << uint32(CreatureID);
return &_worldPacket;
}

1
src/server/game/Server/Packets/BattlePetPackets.h
View File

@@ -63,6 +63,7 @@ namespace WorldPackets
uint16 Trap = 0;
std::vector<BattlePetSlot> Slots;
std::vector<BattlePet> Pets;
bool HasJournalLock = true;
};
class BattlePetJournalLockAcquired final : public ServerPacket