From 4c4c03a074e9b61fcf06d37c622ae23ec3be295d Mon Sep 17 00:00:00 2001 From: Aokromes Date: Tue, 24 Jan 2017 12:35:47 +0100 Subject: [PATCH] more missing part --- src/server/game/Entities/DynamicObject/DynamicObject.h | 3 ++- src/server/game/Groups/Group.h | 2 +- src/server/game/Spells/SpellEffects.cpp | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/server/game/Entities/DynamicObject/DynamicObject.h b/src/server/game/Entities/DynamicObject/DynamicObject.h index 01ad9668de..48ce217964 100644 --- a/src/server/game/Entities/DynamicObject/DynamicObject.h +++ b/src/server/game/Entities/DynamicObject/DynamicObject.h @@ -29,7 +29,8 @@ enum DynamicObjectType { DYNAMIC_OBJECT_PORTAL = 0x0, // unused DYNAMIC_OBJECT_AREA_SPELL = 0x1, - DYNAMIC_OBJECT_FARSIGHT_FOCUS = 0x2 + DYNAMIC_OBJECT_FARSIGHT_FOCUS = 0x2, + DYNAMIC_OBJECT_RAID_MARKER = 0x3 }; class TC_GAME_API DynamicObject : public WorldObject, public GridObject, public MapObject diff --git a/src/server/game/Groups/Group.h b/src/server/game/Groups/Group.h index 19ceda3cb2..aa69fe2143 100644 --- a/src/server/game/Groups/Group.h +++ b/src/server/game/Groups/Group.h @@ -217,7 +217,7 @@ class TC_GAME_API Group void AddMarkerToList(uint64 guid) { m_dynObj.push_back(guid); } void RemoveMarkerFromList(uint64 guid) { m_dynObj.remove(guid); } void RemoveAllMarkerFromList() { m_dynObj.clear(); } - void RemoveMarker(); + void RemoveMarker(); // properties accessories bool IsFull() const; diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 6b39e1eae9..9bcdc6d816 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -4189,7 +4189,7 @@ void Spell::EffectSummonDynObj(SpellEffIndex effIndex) float radius = m_spellInfo->Effects[effIndex].CalcRadius(m_caster); DynamicObject* dynObj = new DynamicObject(false); - if (!dynObj->CreateDynamicObject(sObjectMgr->GenerateLowGuid(HIGHGUID_DYNAMICOBJECT), m_caster, m_spellInfo, *destTarget, radius, DYNAMIC_OBJECT_RAID_MARKER)) + if (!dynObj->CreateDynamicObject(m_caster->GetMap()->GenerateLowGuid(), m_caster, m_spellInfo, *destTarget, radius, DYNAMIC_OBJECT_RAID_MARKER)) { delete dynObj; return; @@ -4216,7 +4216,7 @@ void Spell::EffectSummonRaidMarker(SpellEffIndex effIndex) float radius = m_spellInfo->Effects[effIndex].CalcRadius(m_caster); DynamicObject* dynObj = new DynamicObject(false); - if (!dynObj->CreateDynamicObject(sObjectMgr->GenerateLowGuid(HIGHGUID_DYNAMICOBJECT), m_caster, m_spellInfo, *destTarget, radius, DYNAMIC_OBJECT_RAID_MARKER)) + if (!dynObj->CreateDynamicObject(m_caster->GetMap()->GenerateLowGuid(), m_caster, m_spellInfo, *destTarget, radius, DYNAMIC_OBJECT_RAID_MARKER)) { delete dynObj; return;