From 719ef954c087d8e3a89c573aeaecbff045e4618f Mon Sep 17 00:00:00 2001 From: adya Date: Tue, 26 Mar 2024 22:00:39 +0000 Subject: [PATCH] maintenance --- SPID/src/Distribute.cpp | 3 +-- SPID/src/DistributeManager.cpp | 2 +- SPID/src/LinkedDistribution.cpp | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/SPID/src/Distribute.cpp b/SPID/src/Distribute.cpp index 3917935..366cde2 100644 --- a/SPID/src/Distribute.cpp +++ b/SPID/src/Distribute.cpp @@ -228,12 +228,11 @@ namespace Distribute Forms::DistributionSet::empty(), Forms::DistributionSet::empty() }; - + detail::distribute(npcData, input, entries, &distributedForms); // TODO: We can now log per-NPC distributed forms. if (!distributedForms.empty()) { - LinkedDistribution::Manager::GetSingleton()->ForEachLinkedDeathDistributionSet(distributedForms, [&](Forms::DistributionSet& set) { detail::distribute(npcData, input, set, nullptr); // TODO: Accumulate forms here? to log what was distributed. }); diff --git a/SPID/src/DistributeManager.cpp b/SPID/src/DistributeManager.cpp index 9bb2d8e..3b9e91f 100644 --- a/SPID/src/DistributeManager.cpp +++ b/SPID/src/DistributeManager.cpp @@ -189,7 +189,7 @@ namespace Distribute::Event const auto actor = a_event->actorDying->As(); const auto npc = actor ? actor->GetActorBase() : nullptr; if (actor && npc) { - auto npcData = NPCData(actor, npc); + auto npcData = NPCData(actor, npc); const auto input = PCLevelMult::Input{ actor, npc, false }; DistributeDeathItems(npcData, input); diff --git a/SPID/src/LinkedDistribution.cpp b/SPID/src/LinkedDistribution.cpp index 67d0171..cdbdf67 100644 --- a/SPID/src/LinkedDistribution.cpp +++ b/SPID/src/LinkedDistribution.cpp @@ -240,7 +240,7 @@ namespace LinkedDistribution { for (const auto form : targetForms) { auto& linkedDeathItems = LinkedFormsForForm(form, deathItems); - + DistributionSet linkedEntries{ DistributionSet::empty(), DistributionSet::empty(),