diff --git a/SKSE/Plugins/EnderalSE.dll b/SKSE/Plugins/EnderalSE.dll index 91d5482c..52933ee4 100644 --- a/SKSE/Plugins/EnderalSE.dll +++ b/SKSE/Plugins/EnderalSE.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e3cc5bb32ce859a719433cd24b994965f4a3d461c0d4472ed736a5ee7399552c +oid sha256:ce336c0722e01a31efc0a6ad98590e1be56c6454ceae93e973c9bbe966c2a106 size 663040 diff --git a/source/Enderal DLL/src/Main.cpp b/source/Enderal DLL/src/Main.cpp index 982ba337..55736038 100644 --- a/source/Enderal DLL/src/Main.cpp +++ b/source/Enderal DLL/src/Main.cpp @@ -116,15 +116,16 @@ SKSEPluginLoad(const LoadInterface* skse) { GetPapyrusInterface()->Register(Papyrus::Bind); - if (skse->RuntimeVersion() != RUNTIME_VR_1_4_15 && skse->RuntimeVersion() != RUNTIME_LATEST_VR && g_settings.at("FlatMapMarkers")) { - logger::info("Initializing Flat Map Markers..."); - SKSE::AllocTrampoline(1 << 4); - FlatMapMarkers::Install(); - } - - if (g_settings.at("StayAtSystemPage")) { - logger::info("Initializing Stay At The System Page..."); - JournalMenuEx::InstallHooks(); + if (!IsVR()) { + if (g_settings.at("FlatMapMarkers")) { + logger::info("Initializing Flat Map Markers..."); + SKSE::AllocTrampoline(1 << 4); + FlatMapMarkers::Install(); + } + if (g_settings.at("StayAtSystemPage")) { + logger::info("Initializing Stay At The System Page..."); + JournalMenuEx::InstallHooks(); + } } logger::info("{} has finished loading.", plugin->GetName()); diff --git a/source/Enderal DLL/src/Util.h b/source/Enderal DLL/src/Util.h index 42263551..7255185b 100644 --- a/source/Enderal DLL/src/Util.h +++ b/source/Enderal DLL/src/Util.h @@ -28,6 +28,11 @@ inline bool IsSE() return GetLoadInterface()->RuntimeVersion().minor() == 5; } +inline bool IsVR() +{ + return GetLoadInterface()->RuntimeVersion() == SKSE::RUNTIME_VR_1_4_15 || GetLoadInterface()->RuntimeVersion() == SKSE::RUNTIME_LATEST_VR; +} + inline void SetINISettings() { auto* setting = RE::INIPrefSettingCollection::GetSingleton()->GetSetting("bFreebiesSeen:General");