From c41427e7f315b18a2f7ffd24091db93a239a6c60 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Sat, 1 Jul 2017 13:37:59 -1000 Subject: [PATCH] NOD API changes --- DataSpec/SpecBase.cpp | 2 +- DataSpec/SpecMP1.cpp | 2 +- DataSpec/SpecMP2.cpp | 2 +- DataSpec/SpecMP3.cpp | 2 +- nod | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/DataSpec/SpecBase.cpp b/DataSpec/SpecBase.cpp index 61b2ff3f2..911e7ef0c 100644 --- a/DataSpec/SpecBase.cpp +++ b/DataSpec/SpecBase.cpp @@ -108,7 +108,7 @@ void SpecBase::doExtract(const ExtractPassInfo& info, FProgress progress) /* Extract root files for repacking later */ hecl::ProjectPath outDir(m_project.getProjectWorkingPath(), _S("out")); outDir.makeDirChain(true); - nod::ExtractionContext ctx = {true, info.force, nullptr}; + nod::ExtractionContext ctx = {info.force, nullptr}; if (!m_standalone) { diff --git a/DataSpec/SpecMP1.cpp b/DataSpec/SpecMP1.cpp index 991d09a44..34e24ea87 100644 --- a/DataSpec/SpecMP1.cpp +++ b/DataSpec/SpecMP1.cpp @@ -348,7 +348,7 @@ struct SpecMP1 : SpecBase { m_project.enableDataSpecs({_S("MP1-PC")}); - nod::ExtractionContext ctx = {true, force, nullptr}; + nod::ExtractionContext ctx = {force, nullptr}; m_workPath.makeDir(); diff --git a/DataSpec/SpecMP2.cpp b/DataSpec/SpecMP2.cpp index f6f0856f7..34c9f1b2b 100644 --- a/DataSpec/SpecMP2.cpp +++ b/DataSpec/SpecMP2.cpp @@ -212,7 +212,7 @@ struct SpecMP2 : SpecBase bool extractFromDisc(nod::DiscBase&, bool force, FProgress progress) { - nod::ExtractionContext ctx = {true, force, nullptr}; + nod::ExtractionContext ctx = {force, nullptr}; m_workPath.makeDir(); diff --git a/DataSpec/SpecMP3.cpp b/DataSpec/SpecMP3.cpp index b10557f87..ce4a975a7 100644 --- a/DataSpec/SpecMP3.cpp +++ b/DataSpec/SpecMP3.cpp @@ -333,7 +333,7 @@ struct SpecMP3 : SpecBase hecl::SystemString currentTarget = _S(""); size_t nodeCount = 0; int prog = 0; - nod::ExtractionContext ctx = {true, force, + nod::ExtractionContext ctx = {force, [&](const std::string& name, float) { hecl::SystemStringView nameView(name); diff --git a/nod b/nod index 55ed73b9b..41148a136 160000 --- a/nod +++ b/nod @@ -1 +1 @@ -Subproject commit 55ed73b9bb1ec76303a79fd07f80728acbe5a46b +Subproject commit 41148a1368f0294addfb5abc5fccdbdfe0c3569b