Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 08:55:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some fixes

Browse Source
This commit is contained in:
Aokromes
2017-01-26 17:39:24 +01:00
parent 9ba174d387
commit 4a3d10502b
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/server/game/Groups/Group.cpp
View File

@@ -1626,11 +1626,8 @@ DynamicObject* Group::GetMarkerGuidBySpell(uint32 spell)
{
for (DynObjectList::const_iterator i = m_dynObj.begin(); i != m_dynObj.end(); ++i)
{
DynamicObject* dynObj = ObjectAccessor::GetObjectInWorld(*i, (DynamicObject*)NULL);
if (!dynObj)
continue;
if (dynObj->GetEntry() == spell)
DynamicObject* dynObj = *i;
if (dynObj && dynObj->GetEntry() == spell)
return dynObj;
}
}
@@ -1652,7 +1649,7 @@ void Group::RemoveMarker()
if (!dynObject)
continue;
RemoveMarkerFromList(dynObject->GetGUID());
RemoveMarkerFromList(dynObject);
dynObject->RemoveFromWorld();
}
}

6
src/server/game/Groups/Group.h
View File

@@ -214,8 +214,8 @@ class TC_GAME_API Group
uint32 GetMarkerMask() { return m_markerMask; }
DynamicObject* GetMarkerGuidBySpell(uint32 spell);
void AddMarkerToList(ObjectGuid guid) { m_dynObj.push_back(guid); }
void RemoveMarkerFromList(ObjectGuid guid) { m_dynObj.remove(guid); }
void AddMarkerToList(DynamicObject* dynObj) { m_dynObj.push_back(dynObj); }
void RemoveMarkerFromList(DynamicObject* dynObj) { m_dynObj.remove(dynObj); }
void RemoveAllMarkerFromList() { m_dynObj.clear(); }
void RemoveMarker();
@@ -380,7 +380,7 @@ class TC_GAME_API Group
uint32 m_maxEnchantingLevel;
uint32 m_dbStoreId; // Represents the ID used in database (Can be reused by other groups if group was disbanded)
typedef std::list<uint64> DynObjectList;
typedef std::list<DynamicObject*> DynObjectList;
DynObjectList m_dynObj;
};
#endif

2
src/server/game/Spells/SpellEffects.cpp
View File

@@ -4223,7 +4223,7 @@ void Spell::EffectSummonRaidMarker(SpellEffIndex effIndex)
return;
}
group->AddMarkerToList(dynObj->GetGUID());
group->AddMarkerToList(dynObj);
group->AddGroupMarkerMask(slotMask);
group->SendRaidMarkerUpdate();