diff options
author | megamage <none@none> | 2008-12-18 09:44:57 -0600 |
---|---|---|
committer | megamage <none@none> | 2008-12-18 09:44:57 -0600 |
commit | 0f1f748138495ec80e079227c0002e233b3173bd (patch) | |
tree | c9b904116b791a4cad94ccc1b94a52a9fdceb173 /src | |
parent | 49290bf0106675cee9920d4bbbf950e2b3b18d06 (diff) |
*Fix build in Linux.
*Fix a bug of bloodboil. By Anubisss.
--HG--
branch : trunk
Diffstat (limited to 'src')
-rw-r--r-- | src/game/Object.cpp | 6 | ||||
-rw-r--r-- | src/game/Object.h | 2 | ||||
-rw-r--r-- | src/game/SpellMgr.cpp | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/game/Object.cpp b/src/game/Object.cpp index 7de1cb5da4e..b4be90747cf 100644 --- a/src/game/Object.cpp +++ b/src/game/Object.cpp @@ -1620,3 +1620,9 @@ void WorldObject::GetNearPoint(WorldObject const* searcher, float &x, float &y, UpdateGroundPositionZ(x,y,z); } + +template<class NOTIFIER> +void WorldObject::VisitNearbyObject(const float &radius, NOTIFIER ¬ifier) const +{ + GetMap()->VisitAll(GetPositionX(), GetPositionY(), radius, notifier); +}
\ No newline at end of file diff --git a/src/game/Object.h b/src/game/Object.h index 70bb50893da..8eb26784b21 100644 --- a/src/game/Object.h +++ b/src/game/Object.h @@ -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); bool isActive() const { return m_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: explicit WorldObject(); std::string m_name; diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 0679d4c2261..847539f4eca 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -1916,7 +1916,7 @@ void SpellMgr::LoadSpellCustomAttr() tempSpell->MaxAffectedTargets = 3; break; case 42005: // Bloodboil - tempSpell->MaxAffectedTargets = 6; + tempSpell->MaxAffectedTargets = 5; break; case 8122: case 8124: case 10888: case 10890: // Psychic Scream tempSpell->Attributes |= SPELL_ATTR_BREAKABLE_BY_DAMAGE; |