Skip to content
Merged
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
22 changes: 18 additions & 4 deletions src/XSEPlugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -194,16 +194,30 @@ bool Load()
}
}

auto pushMissingDllError = [&](std::string_view dllName) {
auto errorMessage = std::format("Required DLL {} was missing", dllName);
logger::error("{}", errorMessage);
errors.push_back(errorMessage);
};

// Engine Fixes: VR accepts either EngineFixesVR.dll or the EngineFixes.dll NG
if (REL::Module::IsVR()) {
if (!LoadLibrary(L"Data/SKSE/Plugins/EngineFixesVR.dll") && !LoadLibrary(L"Data/SKSE/Plugins/EngineFixes.dll")) {
pushMissingDllError("EngineFixesVR.dll or EngineFixes.dll");
}
} else {
if (!LoadLibrary(L"Data/SKSE/Plugins/EngineFixes.dll")) {
pushMissingDllError(stl::utf16_to_utf8(L"Data/SKSE/Plugins/EngineFixes.dll").value_or("<unicode conversion error>"s));
}
}

const std::array requiredDLLs = {
REL::Module::IsVR() ? L"Data/SKSE/Plugins/EngineFixesVR.dll" : L"Data/SKSE/Plugins/EngineFixes.dll",
L"Data/SKSE/Plugins/CrashLogger.dll"
};

for (const auto dll : requiredDLLs) {
if (!LoadLibrary(dll)) {
auto errorMessage = std::format("Required DLL {} was missing", stl::utf16_to_utf8(dll).value_or("<unicode conversion error>"s));
logger::error("{}", errorMessage);
errors.push_back(errorMessage);
pushMissingDllError(stl::utf16_to_utf8(dll).value_or("<unicode conversion error>"s));
}
}

Expand Down
Loading