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