diff --git a/SKSE/Plugins/EnderalSE.dll b/SKSE/Plugins/EnderalSE.dll index 0a4cd391..4239dfa3 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:c5d64977f3e7f511e0009e5b63323e06ed08017a5244dc73e83b787941a106bf -size 641536 +oid sha256:ca53b8bec9e51db776840ffbd043d637b1bc960c0c37621ab5fa07d1f590bde0 +size 643584 diff --git a/source/Enderal DLL/src/CheckInvalidForms.h b/source/Enderal DLL/src/CheckInvalidForms.h index 0214e8b4..810a879c 100644 --- a/source/Enderal DLL/src/CheckInvalidForms.h +++ b/source/Enderal DLL/src/CheckInvalidForms.h @@ -1183,3 +1183,26 @@ inline void CheckCCMods() } } } + +inline void CheckUnconvertedMap() +{ + auto* form = RE::TESForm::LookupByID(0x1D3C); // Vyn + RE::TESWorldSpace* world = form ? form->As() : nullptr; + + if (!form || !world) { + MessageBoxW(NULL, L"Unable to load Vyn, make sure you are not using EnderalSE.dll in Skyrim.", L"Error", MB_OK | MB_ICONERROR); + exit(EXIT_FAILURE); + } + + if (world->worldMapOffsetData.mapScale > 1.1) { + if (!bMessageShown) { + bMessageShown = true; + RE::DebugMessageBox(std::format("{} is an Enderal LE mod, containing unconverted map data.\nCheck console for the list of flagged mods.", form->GetFile()->fileName).c_str()); + RE::ConsoleLog::GetSingleton()->Print("Some of the installed mods are incompatible! This list is not exhaustive, always use xEdit to verify mod compatibility."); + } + if (!aModNames.contains(form->GetFile()->fileName)) { + aModNames.insert(form->GetFile()->fileName); + RE::ConsoleLog::GetSingleton()->Print(std::format("{} is unconverted", form->GetFile()->fileName).c_str()); + } + } +} diff --git a/source/Enderal DLL/src/EventListener.cpp b/source/Enderal DLL/src/EventListener.cpp index ca90a8df..bcbf9e8f 100644 --- a/source/Enderal DLL/src/EventListener.cpp +++ b/source/Enderal DLL/src/EventListener.cpp @@ -49,6 +49,8 @@ auto EventListener::ProcessEvent( if (RE::UI::GetSingleton()->IsMenuOpen(RE::DialogueMenu::MENU_NAME)) { const auto movie = RE::UI::GetSingleton()->GetMovieView(RE::JournalMenu::MENU_NAME); if (movie) { + // skse.OpenMenu("Journal Menu") opens quest journal uninitialized, without any tab active and hotkeys bound + // We have to activate a tab for it to work properly std::array args; args[0].SetNumber(2); args[1].SetBoolean(true); diff --git a/source/Enderal DLL/src/Util.h b/source/Enderal DLL/src/Util.h index 298cd1a8..f093b829 100644 --- a/source/Enderal DLL/src/Util.h +++ b/source/Enderal DLL/src/Util.h @@ -54,6 +54,7 @@ inline void CheckIncompatibleMods() RE::ConsoleLog::GetSingleton()->Print("Loaded SureAI's Enderal: Forgotten Stories | Special Edition port v2.0.12 by Eddoursul et al"); CheckWorldspaces(); + CheckUnconvertedMap(); CheckSkyrimCells(); CheckEnderalCells(); }