Merge branch 'development' into aq

This commit is contained in:
Gemt
2017-04-15 22:30:07 +02:00
26 changed files with 321 additions and 64 deletions
+9 -1
View File
@@ -1579,7 +1579,15 @@ void DoScriptText(int32 iTextEntry, WorldObject* pSource, Unit* pTarget)
if (pData->SoundId)
{
if (GetSoundEntriesStore()->LookupEntry(pData->SoundId))
pSource->PlayDirectSound(pData->SoundId);
{
if(pData->Type == CHAT_TYPE_ZONE_YELL)
{
if(Map* pZone = pSource->GetMap())
pZone->PlayDirectSoundToMap(pData->SoundId);
}
else
pSource->PlayDirectSound(pData->SoundId);
}
else
sLog.outError("DoScriptText entry %i tried to process invalid sound id %u.", iTextEntry, pData->SoundId);
}