AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-07-02 03:13:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

CPoiToWorld: Make use of unique_ptr

Browse Source 
Safer memory management.
This commit is contained in:
Lioncash 2020-06-19 03:22:22 -04:00
parent df29cc2109
commit a6caff1387
2 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/Core/Resource/CPoiToWorld.cpp
View File

@ -1,29 +1,25 @@
#include "CPoiToWorld.h"
CPoiToWorld::CPoiToWorld(CResourceEntry *pEntry /*= 0*/)
CPoiToWorld::CPoiToWorld(CResourceEntry *pEntry)
: CResource(pEntry)
{
}
CPoiToWorld::~CPoiToWorld()
{
for (auto it = mMaps.begin(); it != mMaps.end(); it++)
delete *it;
}
CPoiToWorld::~CPoiToWorld() = default;
void CPoiToWorld::AddPoi(uint32 PoiID)
{
// Check if this POI already exists
auto it = mPoiLookupMap.find(PoiID);
const auto it = mPoiLookupMap.find(PoiID);
if (it == mPoiLookupMap.end())
{
SPoiMap *pMap = new SPoiMap();
pMap->PoiID = PoiID;
if (it != mPoiLookupMap.end())
return;
mMaps.push_back(pMap);
mPoiLookupMap[PoiID] = pMap;
}
auto pMap = std::make_unique<SPoiMap>();
pMap->PoiID = PoiID;
auto* ptr = mMaps.emplace_back(std::move(pMap)).get();
mPoiLookupMap.insert_or_assign(PoiID, ptr);
}
void CPoiToWorld::AddPoiMeshMap(uint32 PoiID, uint32 ModelID)
@ -45,7 +41,7 @@ void CPoiToWorld::AddPoiMeshMap(uint32 PoiID, uint32 ModelID)
void CPoiToWorld::RemovePoi(uint32 PoiID)
{
for (auto it = mMaps.begin(); it != mMaps.end(); it++)
for (auto it = mMaps.begin(); it != mMaps.end(); ++it)
{
if ((*it)->PoiID == PoiID)
{
@ -58,19 +54,19 @@ void CPoiToWorld::RemovePoi(uint32 PoiID)
void CPoiToWorld::RemovePoiMeshMap(uint32 PoiID, uint32 ModelID)
{
auto MapIt = mPoiLookupMap.find(PoiID);
const auto MapIt = mPoiLookupMap.find(PoiID);
if (MapIt != mPoiLookupMap.end())
if (MapIt == mPoiLookupMap.end())
return;
SPoiMap *pMap = MapIt->second;
for (auto ListIt = pMap->ModelIDs.begin(); ListIt != pMap->ModelIDs.end(); ++ListIt)
{
SPoiMap *pMap = MapIt->second;
for (auto ListIt = pMap->ModelIDs.begin(); ListIt != pMap->ModelIDs.end(); ListIt++)
if (*ListIt == ModelID)
{
if (*ListIt == ModelID)
{
pMap->ModelIDs.erase(ListIt);
break;
}
pMap->ModelIDs.erase(ListIt);
break;
}
}
}

5
src/Core/Resource/CPoiToWorld.h
View File

@ -4,6 +4,7 @@
#include "CResource.h"
#include <list>
#include <map>
#include <memory>
#include <vector>
class CPoiToWorld : public CResource
@ -18,7 +19,7 @@ public:
};
private:
std::vector<SPoiMap*> mMaps;
std::vector<std::unique_ptr<SPoiMap>> mMaps;
std::map<uint32,SPoiMap*> mPoiLookupMap;
public:
@ -37,7 +38,7 @@ public:
const SPoiMap* MapByIndex(size_t Index) const
{
return mMaps[Index];
return mMaps[Index].get();
}
const SPoiMap* MapByID(uint32 InstanceID) const