AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix trailing whitespace on layer names

This commit is contained in:
Phillip Stephens 2015-08-31 19:54:02 -07:00
parent 2417eef951
commit 714f81352d
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
DataSpec/DNAMP1/DNAMP1.cpp
View File

@ -165,6 +165,18 @@ void PAKBridge::build()
areaDeps.layers.emplace_back(); areaDeps.layers.emplace_back();
Area::Layer& layer = areaDeps.layers.back(); Area::Layer& layer = areaDeps.layers.back();
layer.name = LayerName(mlvl.layerNames[layerIdx++]); layer.name = LayerName(mlvl.layerNames[layerIdx++]);
/* Trim possible trailing whitespace */
if (layer.name.size())
{
#if HECL_UCS2
while (iswblank(layer.name.back()))
layer.name.pop_back();
#else
while (isblank(layer.name.back()))
layer.name.pop_back();
#endif
}
layer.resources.reserve(area.depLayers[l] - r); layer.resources.reserve(area.depLayers[l] - r);
for (; r<area.depLayers[l] ; ++r) for (; r<area.depLayers[l] ; ++r)
layer.resources.emplace(area.deps[r].id); layer.resources.emplace(area.deps[r].id);

12
DataSpec/DNAMP2/DNAMP2.cpp
View File

@ -172,6 +172,18 @@ void PAKBridge::build()
areaDeps.layers.emplace_back(); areaDeps.layers.emplace_back();
Area::Layer& layer = areaDeps.layers.back(); Area::Layer& layer = areaDeps.layers.back();
layer.name = LayerName(mlvl.layerNames[layerIdx++]); layer.name = LayerName(mlvl.layerNames[layerIdx++]);
/* Trim possible trailing whitespace */
if (layer.name.size())
{
#if HECL_UCS2
while (iswblank(layer.name.back()))
layer.name.pop_back();
#else
while (isblank(layer.name.back()))
layer.name.pop_back();
#endif
}
layer.resources.reserve(area.depLayers[l] - r); layer.resources.reserve(area.depLayers[l] - r);
for (; r<area.depLayers[l] ; ++r) for (; r<area.depLayers[l] ; ++r)
layer.resources.emplace(area.deps[r].id); layer.resources.emplace(area.deps[r].id);