Core/Units: ported power type updates from master branch
This commit is contained in:
1 parent
e67167e8cf
commit
b653f2f819
40 files changed
+259
-278
No files matched your search
@@ -1030,7 +1030,7 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player* player, WorldPacke
|
||||
if (mask & GROUP_UPDATE_FLAG_MAX_HP)
|
||||
*data << int32(player->GetMaxHealth());
|
||||
|
||||
Powers powerType = player->getPowerType();
|
||||
Powers powerType = player->GetPowerType();
|
||||
if (mask & GROUP_UPDATE_FLAG_POWER_TYPE)
|
||||
*data << uint8(powerType);
|
||||
|
||||
@@ -1135,7 +1135,7 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player* player, WorldPacke
|
||||
if (mask & GROUP_UPDATE_FLAG_PET_POWER_TYPE)
|
||||
{
|
||||
if (pet)
|
||||
*data << uint8(pet->getPowerType());
|
||||
*data << uint8(pet->GetPowerType());
|
||||
else
|
||||
*data << uint8(0);
|
||||
}
|
||||
@@ -1143,7 +1143,7 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player* player, WorldPacke
|
||||
if (mask & GROUP_UPDATE_FLAG_PET_CUR_POWER)
|
||||
{
|
||||
if (pet)
|
||||
*data << int16(pet->GetPower(pet->getPowerType()));
|
||||
*data << int16(pet->GetPower(pet->GetPowerType()));
|
||||
else
|
||||
*data << int16(0);
|
||||
}
|
||||
@@ -1151,7 +1151,7 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player* player, WorldPacke
|
||||
if (mask & GROUP_UPDATE_FLAG_PET_MAX_POWER)
|
||||
{
|
||||
if (pet)
|
||||
*data << int16(pet->GetMaxPower(pet->getPowerType()));
|
||||
*data << int16(pet->GetMaxPower(pet->GetPowerType()));
|
||||
else
|
||||
*data << int16(0);
|
||||
}
|
||||
@@ -1232,7 +1232,7 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode(WorldPacket& recvData)
|
||||
}
|
||||
|
||||
Pet* pet = player->GetPet();
|
||||
Powers powerType = player->getPowerType();
|
||||
Powers powerType = player->GetPowerType();
|
||||
|
||||
WorldPacket data(SMSG_PARTY_MEMBER_STATS_FULL, 4+2+2+2+1+2*6+8+1+8);
|
||||
data << uint8(0); // only for SMSG_PARTY_MEMBER_STATS_FULL, probably arena/bg related
|
||||
@@ -1336,13 +1336,13 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode(WorldPacket& recvData)
|
||||
data << uint32(pet->GetMaxHealth());
|
||||
|
||||
if (updateFlags & GROUP_UPDATE_FLAG_PET_POWER_TYPE)
|
||||
data << (uint8)pet->getPowerType();
|
||||
data << (uint8)pet->GetPowerType();
|
||||
|
||||
if (updateFlags & GROUP_UPDATE_FLAG_PET_CUR_POWER)
|
||||
data << uint16(pet->GetPower(pet->getPowerType()));
|
||||
data << uint16(pet->GetPower(pet->GetPowerType()));
|
||||
|
||||
if (updateFlags & GROUP_UPDATE_FLAG_PET_MAX_POWER)
|
||||
data << uint16(pet->GetMaxPower(pet->getPowerType()));
|
||||
data << uint16(pet->GetMaxPower(pet->GetPowerType()));
|
||||
|
||||
// GROUP_UPDATE_FLAG_PET_AURAS
|
||||
uint64 petAuraMask = 0;
|
||||
|
||||
Reference in new issue
Block a user