Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions src/Config/Papyrus.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,22 +40,24 @@ namespace QuickLoot::Config
return;
};

MCMScript = Util::ScriptObject::FromForm(quest, "QuickLootIEMCM");
if (!MCMScript.IsValid()) {
logger::info("Unable to locate MCM script on form");
return;
};
MCMQuest = quest;

logger::info("MCM pointer set successfully");
logger::info("MCM quest pointer set successfully");

UserSettings::Update();
};

void Papyrus::UpdateVariables(RE::StaticFunctionTag*)
{
auto MCMScript = Util::ScriptObject::FromForm(MCMQuest, "QuickLootIEMCM");
if (!MCMScript.IsValid()) {
logger::error("Unable to locate MCM script on form");
return;
}

PROFILE_SCOPE;

#define LoadSettingsVar(name, ...) LoadSetting(name, #name, __VA_ARGS__)
#define LoadSettingsVar(name, ...) LoadSetting(MCMScript, name, #name, __VA_ARGS__)

// General > Behavior Settings
LoadSettingsVar(QLIE_ShowInCombat, true);
Expand Down
6 changes: 3 additions & 3 deletions src/Config/Papyrus.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace QuickLoot::Config
{
static Util::ScriptObject MCMScript{};
static RE::TESQuest* MCMQuest{ nullptr };

inline bool QLIE_ShowInCombat;
inline bool QLIE_ShowWhenEmpty;
Expand Down Expand Up @@ -140,9 +140,9 @@ namespace QuickLoot::Config
}

template <typename T>
static void LoadSetting(T& variable, const std::string& propertyName, const T& defaultValue)
static void LoadSetting(Util::ScriptObject& mcmscript, T& variable, const std::string& propertyName, const T& defaultValue)
{
const auto* prop = MCMScript.GetProperty(propertyName);
const auto* prop = mcmscript.GetProperty(propertyName);

if (!prop) {
variable = defaultValue;
Expand Down