AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-05-15 11:51:31 +00:00
Code Issues Projects Releases Wiki Activity

more stable string trim

Browse Source
This commit is contained in:
Jack Andersen 2015-09-01 09:26:55 -10:00
parent 714f81352d
commit c98ebe2fbe
3 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
DataSpec/DNAMP1/DNAMP1.cpp
View File

@ -138,16 +138,13 @@ void PAKBridge::build()
areaDeps.name = areaName.getSystemString(FOURCC('ENGL'), 0); areaDeps.name = areaName.getSystemString(FOURCC('ENGL'), 0);
/* Trim possible trailing whitespace */ /* Trim possible trailing whitespace */
if (areaDeps.name.size())
{
#if HECL_UCS2 #if HECL_UCS2
while (iswblank(areaDeps.name.back())) while (areaDeps.name.size() && iswblank(areaDeps.name.back()))
areaDeps.name.pop_back(); areaDeps.name.pop_back();
#else #else
while (isblank(areaDeps.name.back())) while (areaDeps.name.size() && isblank(areaDeps.name.back()))
areaDeps.name.pop_back(); areaDeps.name.pop_back();
#endif #endif
}
} }
if (areaDeps.name.empty()) if (areaDeps.name.empty())
{ {
@ -166,16 +163,13 @@ void PAKBridge::build()
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 */ /* Trim possible trailing whitespace */
if (layer.name.size())
{
#if HECL_UCS2 #if HECL_UCS2
while (iswblank(layer.name.back())) while (layer.name.size() && iswblank(layer.name.back()))
layer.name.pop_back(); layer.name.pop_back();
#else #else
while (isblank(layer.name.back())) while (layer.name.size() && isblank(layer.name.back()))
layer.name.pop_back(); layer.name.pop_back();
#endif #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)

22
DataSpec/DNAMP2/DNAMP2.cpp
View File

@ -137,16 +137,13 @@ void PAKBridge::build()
areaDeps.name = areaName.getSystemString(FOURCC('ENGL'), 0); areaDeps.name = areaName.getSystemString(FOURCC('ENGL'), 0);
/* Trim possible trailing whitespace */ /* Trim possible trailing whitespace */
if (areaDeps.name.size())
{
#if HECL_UCS2 #if HECL_UCS2
while (iswblank(areaDeps.name.back())) while (areaDeps.name.size() && iswblank(areaDeps.name.back()))
areaDeps.name.pop_back(); areaDeps.name.pop_back();
#else #else
while (isblank(areaDeps.name.back())) while (areaDeps.name.size() && isblank(areaDeps.name.back()))
areaDeps.name.pop_back(); areaDeps.name.pop_back();
#endif #endif
}
} }
if (areaDeps.name.empty()) if (areaDeps.name.empty())
{ {
@ -173,16 +170,13 @@ void PAKBridge::build()
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 */ /* Trim possible trailing whitespace */
if (layer.name.size())
{
#if HECL_UCS2 #if HECL_UCS2
while (iswblank(layer.name.back())) while (layer.name.size() && iswblank(layer.name.back()))
layer.name.pop_back(); layer.name.pop_back();
#else #else
while (isblank(layer.name.back())) while (layer.name.size() && isblank(layer.name.back()))
layer.name.pop_back(); layer.name.pop_back();
#endif #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)

2
hecl

@ -1 +1 @@
Subproject commit 66f39d1b8fbc79f88e71ad06eafbbd5f09c76d78 Subproject commit 3755f82b91bcd950d12a94cbb05ec296677bcc34