AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 17:47:43 +00:00
Code Issues Projects Releases Wiki Activity

Runtime: Collapse emplace_back() calls where applicable

Browse Source 
Same behavior, but with less code.
This commit is contained in:
Lioncash
2020-03-13 16:32:24 -04:00
parent df4487bae8
commit 097d4a4422
18 changed files with 103 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Runtime/World/CWorld.cpp
View File

@@ -72,27 +72,30 @@ std::vector<CWorld::CRelay> CWorld::CRelay::ReadMemoryRelays(athena::io::MemoryR
}
void CWorldLayers::ReadWorldLayers(athena::io::MemoryReader& r, int version, CAssetId mlvlId) {
if (version <= 14)
if (version <= 14) {
return;
}
CWorldLayers ret;
u32 areaCount = r.readUint32Big();
ret.m_areas.reserve(areaCount);
for (u32 i = 0; i < areaCount; ++i) {
ret.m_areas.emplace_back();
ret.m_areas.back().m_layerCount = r.readUint32Big();
ret.m_areas.back().m_layerBits = r.readUint64Big();
auto& area = ret.m_areas.emplace_back();
area.m_layerCount = r.readUint32Big();
area.m_layerBits = r.readUint64Big();
}
u32 nameCount = r.readUint32Big();
const u32 nameCount = r.readUint32Big();
ret.m_names.reserve(nameCount);
for (u32 i = 0; i < nameCount; ++i)
for (u32 i = 0; i < nameCount; ++i) {
ret.m_names.push_back(r.readString());
}
areaCount = r.readUint32Big();
for (u32 i = 0; i < areaCount; ++i)
for (u32 i = 0; i < areaCount; ++i) {
ret.m_areas[i].m_startNameIdx = r.readUint32Big();
}
CWorldState& wldState = g_GameState->StateForWorld(mlvlId);
wldState.GetLayerState()->InitializeWorldLayers(ret.m_areas);