Merge branch 'master' into Playerbot

This commit is contained in:
Yunfan Li
2024-08-01 15:41:23 +08:00
251 changed files with 4841 additions and 6135 deletions

View File

@@ -5002,7 +5002,7 @@ void Spell::WriteSpellGoTargets(WorldPacket* data)
// correct count for both hit and miss).
uint32 hit = 0;
size_t hitPos = data->wpos();
std::size_t hitPos = data->wpos();
*data << (uint8)0; // placeholder
for (std::list<TargetInfo>::const_iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end() && hit < 255; ++ihit)
{
@@ -5022,7 +5022,7 @@ void Spell::WriteSpellGoTargets(WorldPacket* data)
}
uint32 miss = 0;
size_t missPos = data->wpos();
std::size_t missPos = data->wpos();
*data << (uint8)0; // placeholder
for (std::list<TargetInfo>::const_iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end() && miss < 255; ++ihit)
{