2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 05:07:43 +00:00

Various extract tweaks; ResourceLock integration

This commit is contained in:
Jack Andersen
2016-08-11 16:33:38 -10:00
parent 02a4d5501f
commit 42d39bf6b9
7 changed files with 22 additions and 8 deletions

View File

@@ -459,6 +459,11 @@ bool PAKRouter<BRIDGETYPE>::extractResources(const BRIDGETYPE& pakBridge, bool f
const nod::Node* node = m_node.get();
hecl::ProjectPath working = getWorking(item, extractor);
hecl::ResourceLock resLk(working);
if (!resLk)
continue;
/* Extract first, so they start out invalid */
hecl::ProjectPath cooked = getCooked(item);
if (force || cooked.getPathType() == hecl::ProjectPath::Type::None)
@@ -469,7 +474,6 @@ bool PAKRouter<BRIDGETYPE>::extractResources(const BRIDGETYPE& pakBridge, bool f
fclose(fout);
}
hecl::ProjectPath working = getWorking(item, extractor);
if (extractor.func_a) /* Doesn't need PAKRouter access */
{
if (force || working.getPathType() == hecl::ProjectPath::Type::None)