diff --git a/SKSE/Plugins/ArtifactTracker.dll b/SKSE/Plugins/ArtifactTracker.dll index 74d083f..2fb74dd 100644 Binary files a/SKSE/Plugins/ArtifactTracker.dll and b/SKSE/Plugins/ArtifactTracker.dll differ diff --git a/Source/ArtifactTrackerDLL/src/ArtifactTracker.cpp b/Source/ArtifactTrackerDLL/src/ArtifactTracker.cpp index ff229ea..942d356 100644 --- a/Source/ArtifactTrackerDLL/src/ArtifactTracker.cpp +++ b/Source/ArtifactTrackerDLL/src/ArtifactTracker.cpp @@ -202,7 +202,7 @@ namespace ArtifactTracker if (&a_exform) { g_persistentMap[a_exform.formID] = a_exform.As(); } - return true; + return RE::BSContainer::ForEachResult::kContinue; }); std::uint32_t savedCount = g_listStored->forms.size() + g_listFound->forms.size() + g_listNew->forms.size(); @@ -383,7 +383,7 @@ namespace ArtifactTracker cellStorage = refr; } } - return true; + return RE::BSContainer::ForEachResult::kContinue; }); #ifdef _DEBUG @@ -424,7 +424,7 @@ namespace ArtifactTracker cellStorage = &a_ref; } } - return true; + return RE::BSContainer::ForEachResult::kContinue; }); for (int i = 0; i < dupes.size(); i++) { @@ -495,14 +495,14 @@ namespace ArtifactTracker cell->ForEachReference([&](RE::TESObjectREFR& a_ref) { if (ignoreFormID && ignoreFormID == a_ref.formID) { - return true; + return RE::BSContainer::ForEachResult::kContinue; } const auto baseObj = a_ref.GetBaseObject(); if (IsValidContainer(&a_ref)) { if (g_cellContainer == baseObj || baseObj->formID == 0xDC9E7 || g_persistentMap.contains(a_ref.formID)) { // skip persistent and PlayerBookShelfContainer - return true; + return RE::BSContainer::ForEachResult::kContinue; } const auto contInv = a_ref.GetInventory([&](RE::TESBoundObject& a_object) -> bool { @@ -523,11 +523,11 @@ namespace ArtifactTracker } } - return true; + return RE::BSContainer::ForEachResult::kContinue; } if (!g_artifactAllFormTypes.contains(baseObj->GetFormType()) || a_ref.IsDisabled() || a_ref.IsMarkedForDeletion() || cellItems.contains(baseObj->formID)) { - return true; + return RE::BSContainer::ForEachResult::kContinue; } cellItems.insert(baseObj->formID); @@ -542,7 +542,7 @@ namespace ArtifactTracker g_listStored->AddForm(baseObj); } - return true; + return RE::BSContainer::ForEachResult::kContinue; }); for (const auto& [item, data] : inv) { @@ -788,7 +788,7 @@ namespace ArtifactTracker if (refrItem) { AddRefArtifactsToList(refrItem, a_targetList, a_excludeList); } - return true; + return RE::BSContainer::ForEachResult::kContinue; }); return; } diff --git a/Source/ArtifactTrackerDLL/src/Util.h b/Source/ArtifactTrackerDLL/src/Util.h index 781c49b..f0242f3 100644 --- a/Source/ArtifactTrackerDLL/src/Util.h +++ b/Source/ArtifactTrackerDLL/src/Util.h @@ -103,9 +103,9 @@ inline bool RefListHasItem(RE::TESForm* a_refOrList, RE::FormID a_formID) list->ForEachForm([&](RE::TESForm& a_form) { if (&a_form && RefListHasItem(&a_form, a_formID)) { bResult = true; - return false; + return RE::BSContainer::ForEachResult::kStop; } - return true; + return RE::BSContainer::ForEachResult::kContinue; }); return bResult; } diff --git a/Source/ArtifactTrackerDLL/vcpkg-configuration.json b/Source/ArtifactTrackerDLL/vcpkg-configuration.json index 337bdfa..48a3c82 100644 --- a/Source/ArtifactTrackerDLL/vcpkg-configuration.json +++ b/Source/ArtifactTrackerDLL/vcpkg-configuration.json @@ -1,15 +1,15 @@ { "registries": [ - { - "kind": "git", - "repository": "https://gitlab.com/colorglass/vcpkg-colorglass", - "baseline": "5a11d06fd1b2d7cd6339d6aea48d450309e89cc1", - "packages": [ - "commonlibsse-ng", - "gluino", - "script-extender-common", - "skse" - ] - } + { + "kind": "git", + "repository": "https://gitlab.com/colorglass/vcpkg-colorglass", + "baseline": "bbd09a56b951d86dec3ea484ec183d00b013b486", + "packages": [ + "commonlibsse-ng", + "gluino", + "script-extender-common", + "skse" + ] + } ] }