*Fix build in Linux.
*Fix a bug of bloodboil. By Anubisss. --HG-- branch : trunk
This commit is contained in:
@@ -1620,3 +1620,9 @@ void WorldObject::GetNearPoint(WorldObject const* searcher, float &x, float &y,
|
|||||||
|
|
||||||
UpdateGroundPositionZ(x,y,z);
|
UpdateGroundPositionZ(x,y,z);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template<class NOTIFIER>
|
||||||
|
void WorldObject::VisitNearbyObject(const float &radius, NOTIFIER ¬ifier) const
|
||||||
|
{
|
||||||
|
GetMap()->VisitAll(GetPositionX(), GetPositionY(), radius, notifier);
|
||||||
|
}
|
||||||
+1
-1
@@ -479,7 +479,7 @@ class TRINITY_DLL_SPEC WorldObject : public Object
|
|||||||
Creature* SummonTrigger(float x, float y, float z, float ang, uint32 dur, CreatureAI* (*GetAI)(Creature*) = NULL);
|
Creature* SummonTrigger(float x, float y, float z, float ang, uint32 dur, CreatureAI* (*GetAI)(Creature*) = NULL);
|
||||||
bool isActive() const { return m_isActive; }
|
bool isActive() const { return m_isActive; }
|
||||||
void setActive(bool isActive);
|
void setActive(bool isActive);
|
||||||
template<class NOTIFIER> void VisitNearbyObject(const float &radius, NOTIFIER ¬ifier) const { GetMap()->VisitAll(GetPositionX(), GetPositionY(), radius, notifier); }
|
template<class NOTIFIER> void VisitNearbyObject(const float &radius, NOTIFIER ¬ifier) const;
|
||||||
protected:
|
protected:
|
||||||
explicit WorldObject();
|
explicit WorldObject();
|
||||||
std::string m_name;
|
std::string m_name;
|
||||||
|
|||||||
@@ -1916,7 +1916,7 @@ void SpellMgr::LoadSpellCustomAttr()
|
|||||||
tempSpell->MaxAffectedTargets = 3;
|
tempSpell->MaxAffectedTargets = 3;
|
||||||
break;
|
break;
|
||||||
case 42005: // Bloodboil
|
case 42005: // Bloodboil
|
||||||
tempSpell->MaxAffectedTargets = 6;
|
tempSpell->MaxAffectedTargets = 5;
|
||||||
break;
|
break;
|
||||||
case 8122: case 8124: case 10888: case 10890: // Psychic Scream
|
case 8122: case 8124: case 10888: case 10890: // Psychic Scream
|
||||||
tempSpell->Attributes |= SPELL_ATTR_BREAKABLE_BY_DAMAGE;
|
tempSpell->Attributes |= SPELL_ATTR_BREAKABLE_BY_DAMAGE;
|
||||||
|
|||||||
Reference in New Issue
Block a user