AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-16 07:37:02 +00:00
Code Issues Projects Releases Wiki Activity

General: Make use of emplace_back where applicable

Browse Source 
Allows for in-place construction. Also results in less code to read in
certain usages.
This commit is contained in:
Lioncash
2020-03-21 00:12:13 -04:00
parent 36ac0a8d78
commit fc4df76afc
13 changed files with 38 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Runtime/World/CGameArea.cpp
View File

@@ -353,28 +353,31 @@ CGameArea::CGameArea(CInputStream& in, int idx, int mlvlVersion) : x4_selfIdx(id
else
x88_areaId = -1;
u32 attachedCount = in.readUint32Big();
const u32 attachedCount = in.readUint32Big();
x8c_attachedAreaIndices.reserve(attachedCount);
for (u32 i = 0; i < attachedCount; ++i)
x8c_attachedAreaIndices.push_back(in.readUint16Big());
for (u32 i = 0; i < attachedCount; ++i) {
x8c_attachedAreaIndices.emplace_back(in.readUint16Big());
}
x9c_deps1 = ::urde::ReadDependencyList(in);
xac_deps2 = ::urde::ReadDependencyList(in);
zeus::CAABox aabb = x6c_aabb.getTransformedAABox(xc_transform);
const zeus::CAABox aabb = x6c_aabb.getTransformedAABox(xc_transform);
x6c_aabb = aabb;
if (mlvlVersion > 13) {
u32 depCount = in.readUint32Big();
const u32 depCount = in.readUint32Big();
xbc_layerDepOffsets.reserve(depCount);
for (u32 i = 0; i < depCount; ++i)
xbc_layerDepOffsets.push_back(in.readUint32Big());
for (u32 i = 0; i < depCount; ++i) {
xbc_layerDepOffsets.emplace_back(in.readUint32Big());
}
}
u32 dockCount = in.readUint32Big();
const u32 dockCount = in.readUint32Big();
xcc_docks.reserve(dockCount);
for (u32 i = 0; i < dockCount; ++i)
xcc_docks.push_back({in, xc_transform});
for (u32 i = 0; i < dockCount; ++i) {
xcc_docks.emplace_back(in, xc_transform);
}
ClearTokenList();