Skip to content

Commit

Permalink
Revert distribution on load
Browse files Browse the repository at this point in the history
  • Loading branch information
powerof3 committed Jan 16, 2024
1 parent 2e18bf6 commit 601c0ba
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 16 deletions.
2 changes: 1 addition & 1 deletion SPID/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.20)
set(NAME "po3_SpellPerkItemDistributor" CACHE STRING "")
set(VERSION 6.8.1 CACHE STRING "")
set(VERSION 6.8.2 CACHE STRING "")
set(AE_VERSION 1)
set(VR_VERSION 1)

Expand Down
18 changes: 4 additions & 14 deletions SPID/src/DistributeManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,10 @@ namespace Distribute
{
static bool thunk(RE::Character* a_this)
{
if (auto npc = a_this->GetActorBase()) {
const auto process = detail::should_process_NPC(npc);
const auto processOnLoad = detail::should_process_NPC(npc, processedOnLoad);
if (process || processOnLoad) {
if (const auto npc = a_this->GetActorBase()) {
if (detail::should_process_NPC(npc)) {
auto npcData = NPCData(a_this, npc);
if (process) {
Distribute(npcData, false, true);
}
if (processOnLoad) {
DistributeItemOutfits(npcData, { a_this, npc, false });
}
Distribute(npcData, false);
}
}

Expand Down Expand Up @@ -120,9 +113,6 @@ namespace Distribute
if (processedOutfit = factory->Create(); processedOutfit) {
processedOutfit->formEditorID = "SPID_ProcessedOutfit";
}
if (processedOnLoad = factory->Create(); processedOnLoad) {
processedOnLoad->formEditorID = "SPID_ProcessedOnLoad";
}
}

if (Forms::GetTotalLeveledEntries() > 0) {
Expand All @@ -133,7 +123,7 @@ namespace Distribute
Event::Manager::Register();
PCLevelMult::Manager::Register();

DoInitialDistribution();
//DoInitialDistribution();

// Clear logger's buffer to free some memory :)
buffered_logger::clear();
Expand Down
2 changes: 1 addition & 1 deletion SPID/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "spid",
"version-string": "6.8.1",
"version-string": "6.8.2",
"description": "Spell Perk Item Distributor",
"homepage": "https://github.com/powerof3/Spell-Perk-Item-Distributor",
"license": "MIT",
Expand Down

0 comments on commit 601c0ba

Please sign in to comment.