From c97c8d054b9f500ed562db52ccd146da5031bc43 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Sun, 21 May 2017 03:27:21 -0700 Subject: [PATCH] update nod --- DataSpec/SpecMP1.cpp | 2 +- DataSpec/SpecMP2.cpp | 2 +- DataSpec/SpecMP3.cpp | 2 +- nod | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DataSpec/SpecMP1.cpp b/DataSpec/SpecMP1.cpp index 0f33b2583..333aeb103 100644 --- a/DataSpec/SpecMP1.cpp +++ b/DataSpec/SpecMP1.cpp @@ -341,7 +341,7 @@ struct SpecMP1 : SpecBase /* Extract non-pak files */ progress(_S("MP1 Root"), _S(""), 3, 0.0); int prog = 0; - ctx.progressCB = [&](const std::string& name) { + ctx.progressCB = [&](const std::string& name, float) { hecl::SystemStringView nameView(name); progress(_S("MP1 Root"), nameView.c_str(), 3, prog / (float)m_nonPaks.size()); }; diff --git a/DataSpec/SpecMP2.cpp b/DataSpec/SpecMP2.cpp index 46f1a8861..5e9e539ed 100644 --- a/DataSpec/SpecMP2.cpp +++ b/DataSpec/SpecMP2.cpp @@ -229,7 +229,7 @@ struct SpecMP2 : SpecBase mp2OutPath.makeDir(); progress(_S("MP2 Root"), _S(""), 3, 0.0); int prog = 0; - ctx.progressCB = [&](const std::string& name) { + ctx.progressCB = [&](const std::string& name, float) { hecl::SystemStringView nameView(name); progress(_S("MP2 Root"), nameView.c_str(), 3, prog / (float)m_nonPaks.size()); }; diff --git a/DataSpec/SpecMP3.cpp b/DataSpec/SpecMP3.cpp index 189af9d64..b10557f87 100644 --- a/DataSpec/SpecMP3.cpp +++ b/DataSpec/SpecMP3.cpp @@ -334,7 +334,7 @@ struct SpecMP3 : SpecBase size_t nodeCount = 0; int prog = 0; nod::ExtractionContext ctx = {true, force, - [&](const std::string& name) + [&](const std::string& name, float) { hecl::SystemStringView nameView(name); progress(currentTarget.c_str(), nameView.c_str(), compIdx, prog / (float)nodeCount); diff --git a/nod b/nod index 2bc7c4e56..e494dbba9 160000 --- a/nod +++ b/nod @@ -1 +1 @@ -Subproject commit 2bc7c4e568a78babce8bfd38012c8084b3f2157a +Subproject commit e494dbba9f29634ccbd2b9af203b86d11d5466d5