Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Core/Groups: converted group roll raw pointers to smart pointers

Browse Source
This commit is contained in:
Ovahlord committed 2023-10-30 01:26:57 +01:00
1 parent 3e209a76dd
commit e9ea6f8f06
2 files changed
+12 -28
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/game/Groups/Group.cpp
+11 -27
View File
@@ -84,14 +84,6 @@ Group::~Group()
else if (m_bgGroup->GetBgRaid(HORDE) == this) m_bgGroup->SetBgRaid(HORDE, nullptr);
else TC_LOG_ERROR("misc", "Group::~Group: battleground group is not linked to the correct battleground.");
}
Rolls::iterator itr;
while (!RollId.empty())
{
itr = RollId.begin();
Roll *r = *itr;
RollId.erase(itr);
delete(r);
}
// this may unload some instance saves
for (uint8 i = 0; i < MAX_DIFFICULTY; ++i)
@@ -634,7 +626,7 @@ bool Group::RemoveMember(ObjectGuid guid, const RemoveMethod& method /*= GROUP_R
// Remove player from loot rolls
for (Rolls::iterator it = RollId.begin(); it != RollId.end(); ++it)
{
Roll* roll = *it;
Roll* roll = it->get();
Roll::PlayerVote::iterator itr2 = roll->playerVote.find(guid);
if (itr2 == roll->playerVote.end())
continue;
@@ -1071,7 +1063,7 @@ void Group::GroupLoot(Loot* loot, WorldObject* pLootedObject)
{
ObjectGuid newitemGUID = ObjectGuid::Create<HighGuid::Item>(sObjectMgr->GetGenerator<HighGuid::Item>().Generate());
Roll* r = new Roll(newitemGUID, *i);
std::unique_ptr<Roll> r = std::make_unique<Roll>(newitemGUID, *i);
//a vector is filled with only near party members
for (GroupReference* itr = GetFirstMember(); itr != nullptr; itr = itr->next())
@@ -1117,7 +1109,7 @@ void Group::GroupLoot(Loot* loot, WorldObject* pLootedObject)
SendLootStartRoll(60000, pLootedObject->GetMapId(), *r);
RollId.push_back(r);
RollId.push_back(std::move(r));
if (Creature* creature = pLootedObject->ToCreature())
{
@@ -1130,8 +1122,6 @@ void Group::GroupLoot(Loot* loot, WorldObject* pLootedObject)
go->lootingGroupLowGUID = GetLowGUID();
}
}
else
delete r;
}
else
i->is_underthreshold = true;
@@ -1151,7 +1141,7 @@ void Group::GroupLoot(Loot* loot, WorldObject* pLootedObject)
ObjectGuid newitemGUID = ObjectGuid::Create<HighGuid::Item>(sObjectMgr->GetGenerator<HighGuid::Item>().Generate());
Roll* r = new Roll(newitemGUID, *i);
std::unique_ptr<Roll> r = std::make_unique<Roll>(newitemGUID, *i);
//a vector is filled with only near party members
for (GroupReference* itr = GetFirstMember(); itr != nullptr; itr = itr->next())
@@ -1176,7 +1166,7 @@ void Group::GroupLoot(Loot* loot, WorldObject* pLootedObject)
SendLootStartRoll(60000, pLootedObject->GetMapId(), *r);
RollId.push_back(r);
RollId.push_back(std::move(r));
if (Creature* creature = pLootedObject->ToCreature())
{
@@ -1189,8 +1179,6 @@ void Group::GroupLoot(Loot* loot, WorldObject* pLootedObject)
go->lootingGroupLowGUID = GetLowGUID();
}
}
else
delete r;
}
}
@@ -1210,7 +1198,7 @@ void Group::NeedBeforeGreed(Loot* loot, WorldObject* lootedObject)
{
ObjectGuid newitemGUID = ObjectGuid::Create<HighGuid::Item>(sObjectMgr->GetGenerator<HighGuid::Item>().Generate());
Roll* r = new Roll(newitemGUID, *i);
std::unique_ptr<Roll> r = std::make_unique<Roll>(newitemGUID, *i);
for (GroupReference* itr = GetFirstMember(); itr != nullptr; itr = itr->next())
{
@@ -1257,7 +1245,7 @@ void Group::NeedBeforeGreed(Loot* loot, WorldObject* lootedObject)
SendLootStartRollToPlayer(60000, lootedObject->GetMapId(), p, p->CanRollNeedForItem(item), *r);
}
RollId.push_back(r);
RollId.push_back(std::move(r));
if (Creature* creature = lootedObject->ToCreature())
{
@@ -1270,8 +1258,6 @@ void Group::NeedBeforeGreed(Loot* loot, WorldObject* lootedObject)
go->lootingGroupLowGUID = GetLowGUID();
}
}
else
delete r;
}
else
i->is_underthreshold = true;
@@ -1285,7 +1271,7 @@ void Group::NeedBeforeGreed(Loot* loot, WorldObject* lootedObject)
item = sObjectMgr->GetItemTemplate(i->itemid);
ObjectGuid newitemGUID = ObjectGuid::Create<HighGuid::Item>(sObjectMgr->GetGenerator<HighGuid::Item>().Generate());
Roll* r = new Roll(newitemGUID, *i);
std::unique_ptr<Roll> r = std::make_unique<Roll>(newitemGUID, *i);
for (GroupReference* itr = GetFirstMember(); itr != nullptr; itr = itr->next())
{
@@ -1320,7 +1306,7 @@ void Group::NeedBeforeGreed(Loot* loot, WorldObject* lootedObject)
SendLootStartRollToPlayer(60000, lootedObject->GetMapId(), p, p->CanRollNeedForItem(item) == EQUIP_ERR_OK, *r);
}
RollId.push_back(r);
RollId.push_back(std::move(r));
if (Creature* creature = lootedObject->ToCreature())
{
@@ -1333,8 +1319,6 @@ void Group::NeedBeforeGreed(Loot* loot, WorldObject* lootedObject)
go->lootingGroupLowGUID = GetLowGUID();
}
}
else
delete r;
}
}
@@ -1391,7 +1375,7 @@ void Group::CountRollVote(ObjectGuid playerGUID, ObjectGuid Guid, uint8 Choice)
Rolls::iterator rollI = GetRoll(Guid);
if (rollI == RollId.end())
return;
Roll* roll = *rollI;
Roll* roll = rollI->get();
Roll::PlayerVote::iterator itr = roll->playerVote.find(playerGUID);
// this condition means that player joins to the party after roll begins
@@ -1446,7 +1430,7 @@ void Group::EndRoll(Loot* pLoot, Map* allowedMap)
void Group::CountTheRoll(Rolls::iterator rollI, Map* allowedMap)
{
Roll* roll = *rollI;
Roll* roll = rollI->get();
if (!roll->isValid()) // is loot already deleted ?
{
RollId.erase(rollI);
src/server/game/Groups/Group.h
+1 -1
View File
@@ -218,7 +218,7 @@ class TC_GAME_API Group
typedef MemberSlotList::iterator member_witerator;
typedef std::set<Player*> InvitesList;
typedef std::vector<Roll*> Rolls;
typedef std::vector<std::unique_ptr<Roll>> Rolls;
public:
Group();