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

Material extraction fix; Layer indices

Browse Source
This commit is contained in:
Jack Andersen
2015-10-12 11:10:38 -10:00
parent 0bd1469773
commit a53cf8aad3
5 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DataSpec/DNAMP2/DNAMP2.cpp
View File

@@ -90,6 +90,7 @@ void PAKBridge::build()
for (const MLVL::Area& area : mlvl.areas)
{
Level::Area& areaDeps = level.areas[area.areaMREAId];
MLVL::LayerFlags& layerFlags = mlvl.layerFlags[ai];
const DNAMP1::PAK::Entry* areaNameEnt = m_pak.lookupEntry(area.areaNameId);
if (areaNameEnt)
{
@@ -134,6 +135,7 @@ void PAKBridge::build()
areaDeps.layers.emplace_back();
Level::Area::Layer& layer = areaDeps.layers.back();
layer.name = LayerName(mlvl.layerNames[layerIdx++]);
layer.active = layerFlags.flags >> (l-1) & 0x1;
/* Trim possible trailing whitespace */
#if HECL_UCS2
while (layer.name.size() && iswblank(layer.name.back()))
@@ -142,6 +144,8 @@ void PAKBridge::build()
while (layer.name.size() && isblank(layer.name.back()))
layer.name.pop_back();
#endif
HECL::SNPrintf(num, 16, layer.active ? _S("%02ua ") : _S("%02u "), l-1);
layer.name = num + layer.name;
layer.resources.reserve(area.depLayers[l] - r);
for (; r<area.depLayers[l] ; ++r)