1

Updated Clib

This commit is contained in:
Eddoursul 2022-09-20 20:47:52 +02:00
parent ae35ac9fbb
commit b0164109a4
4 changed files with 22 additions and 22 deletions

Binary file not shown.

View File

@ -202,7 +202,7 @@ namespace ArtifactTracker
if (&a_exform) {
g_persistentMap[a_exform.formID] = a_exform.As<RE::TESObjectREFR>();
}
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;
}

View File

@ -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;
}

View File

@ -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"
]
}
]
}