mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 19:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Over 100 camangos Cata commits applied (to c12950)

Browse source 
Over 100 camangos Cata commits applied. up to and inclusing c12950.
This commit is contained in:
Charles A Edwards 2016-08-20 17:10:24 +01:00 • committed by Antz
parent b4ec0440aa
commit eef77eadb9
117 changed files with 4314 additions and 3547 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/game/WorldHandlers/ScriptMgr.cpp
View file

@ -1547,12 +1547,12 @@ bool ScriptAction::HandleScriptStep()
}
// bitmask: 0/1=target-player, 0/2=with distance dependent, 0/4=map wide, 0/8=zone wide
Player* pSoundTarget = NULL;
Player* pSoundTarget = nullptr;
if (m_script->playSound.flags & 1)
{
pSoundTarget = GetPlayerTargetOrSourceAndLog(pSource, pTarget);
if (!pSoundTarget)
{ break; }
break;
}
if (m_script->data_flags & SCRIPT_FLAG_COMMAND_ADDITIONAL)
@ -1560,11 +1560,11 @@ bool ScriptAction::HandleScriptStep()
else
{
if (m_script->playSound.flags & 2)
{ pSource->PlayDistanceSound(m_script->playSound.soundId, pSoundTarget); }
pSource->PlayDistanceSound(m_script->playSound.soundId, pSoundTarget);
else if (m_script->playSound.flags & (4 | 8))
{ m_map->PlayDirectSoundToMap(m_script->playSound.soundId, m_script->playSound.flags & 8 ? pSource->GetZoneId() : 0); }
m_map->PlayDirectSoundToMap(m_script->playSound.soundId, m_script->playSound.flags & 8 ? pSource->GetZoneId() : 0);
else
{ pSource->PlayDirectSound(m_script->playSound.soundId, pSoundTarget); }
pSource->PlayDirectSound(m_script->playSound.soundId, pSoundTarget);
}
break;
}
@ -2697,3 +2697,8 @@ uint32 GetScriptIdsCount()
{
return sScriptMgr.GetScriptIdsCount();
}
bool AddWaypointFromExternal(uint32 entry, int32 pathId, uint32 pointId, float x, float y, float z, float o, uint32 waittime)
{
return sWaypointMgr.AddExternalNode(entry, pathId, pointId, x, y, z, o, waittime);
}