AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-12-16 08:27:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

CPoiToWorld: Make use of size_t where applicable

Browse Source 
Plays nicer with standard containers.
This commit is contained in:
Lioncash
2020-06-18 08:01:13 -04:00
parent 709fcf18ae
commit 09de312ac3
3 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,12 +30,12 @@ public:
void RemovePoi(uint32 PoiID);
void RemovePoiMeshMap(uint32 PoiID, uint32 ModelID);
uint32 NumMappedPOIs() const
size_t NumMappedPOIs() const
{
return mMaps.size();
}
const SPoiMap* MapByIndex(uint32 Index) const
const SPoiMap* MapByIndex(size_t Index) const
{
return mMaps[Index];
}

15
src/Core/Resource/Cooker/CPoiToWorldCooker.cpp
View File

@@ -10,26 +10,23 @@ bool CPoiToWorldCooker::CookEGMC(CPoiToWorld *pPoiToWorld, IOutputStream& rOut)
};
std::vector<SPoiMapping> Mappings;
for (uint32 iPoi = 0; iPoi < pPoiToWorld->NumMappedPOIs(); iPoi++)
for (size_t iPoi = 0; iPoi < pPoiToWorld->NumMappedPOIs(); iPoi++)
{
const CPoiToWorld::SPoiMap *pkMap = pPoiToWorld->MapByIndex(iPoi);
for (auto it = pkMap->ModelIDs.begin(); it != pkMap->ModelIDs.end(); it++)
for (const auto meshID : pkMap->ModelIDs)
{
SPoiMapping Mapping;
Mapping.MeshID = *it;
Mapping.PoiID = pkMap->PoiID;
Mappings.push_back(Mapping);
Mappings.push_back({meshID, pkMap->PoiID});
}
}
// Write EGMC
rOut.WriteLong(Mappings.size());
for (uint32 iMap = 0; iMap < Mappings.size(); iMap++)
for (const auto& mapping : Mappings)
{
rOut.WriteLong(Mappings[iMap].MeshID);
rOut.WriteLong(Mappings[iMap].PoiID);
rOut.WriteLong(mapping.MeshID);
rOut.WriteLong(mapping.PoiID);
}
return true;