From 9bdf9a26408ee8683d35b7db26856a6b7b88ce92 Mon Sep 17 00:00:00 2001 From: Eddoursul Date: Fri, 27 Oct 2023 18:04:08 +0200 Subject: [PATCH] Removed the More Affinities check, it is now redundant --- SKSE/Plugins/EnderalSE.dll | 4 ++-- scripts/_00e_playersetupscript.pex | Bin 5302 -> 5041 bytes source/Enderal DLL/src/CheckInvalidForms.h | 21 --------------------- source/Enderal DLL/src/Util.h | 3 --- source/scripts/_00e_playersetupscript.psc | 5 ----- 5 files changed, 2 insertions(+), 31 deletions(-) diff --git a/SKSE/Plugins/EnderalSE.dll b/SKSE/Plugins/EnderalSE.dll index f169fb6c..79881c56 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:e5a11c44f90d68c3ce54dc019838aa64d1420799dcc2641c454a85ce3b87dd71 -size 719872 +oid sha256:6c5a759580e8541d086b08dddf8fd9f63749add3896d35dd9c6af843dc2c56c3 +size 717824 diff --git a/scripts/_00e_playersetupscript.pex b/scripts/_00e_playersetupscript.pex index acdf3b3ad0327b4d50c7ad3286b14e80101dbc80..e380ebf9b2032c3c87e9b5509fb9494c75fb45b1 100644 GIT binary patch literal 5041 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 diff --git a/source/Enderal DLL/src/CheckInvalidForms.h b/source/Enderal DLL/src/CheckInvalidForms.h index 02f21afd..423a3b80 100644 --- a/source/Enderal DLL/src/CheckInvalidForms.h +++ b/source/Enderal DLL/src/CheckInvalidForms.h @@ -10,27 +10,6 @@ inline bool DataFileExists(std::string filename, int maxSize = 1000000) return std::filesystem::exists(path) && std::filesystem::file_size(path) > maxSize; } -inline void CheckBlacklist() -{ - const auto dataHandler = RE::TESDataHandler::GetSingleton(); - - if (!dataHandler) { - return; - } - - std::string filenames[1] = { - "Enderal_FS_More_Affinities.esp", - }; - - for (short i = 0; i < 1; i++) { - if (dataHandler->LookupLoadedModByName(filenames[i])) { - aModNames.insert(filenames[i]); - RE::DebugMessageBox(std::format("{} is incompatible with Enderal SE.\nCheck console for the list of flagged mods.", filenames[i]).c_str()); - RE::ConsoleLog::GetSingleton()->Print(std::format("{} is incompatible", filenames[i]).c_str()); - } - } -} - inline void NotifyInvalidForm(const RE::TESForm* form) { if (!form) { diff --git a/source/Enderal DLL/src/Util.h b/source/Enderal DLL/src/Util.h index e2d67ec6..533d2349 100644 --- a/source/Enderal DLL/src/Util.h +++ b/source/Enderal DLL/src/Util.h @@ -54,7 +54,6 @@ inline void CheckIncompatibleMods() RE::ConsoleLog::GetSingleton()->Print("Loaded SureAI's Enderal: Forgotten Stories | Special Edition v2.0.x by Eddoursul and contributors"); } - CheckBlacklist(); CheckWorldspaces(); CheckUnconvertedMap(); CheckSkyrimCells(); @@ -67,8 +66,6 @@ inline void CheckIncompatibleMods() inline bool PapyrusGlobalFunctionExists(const char* scriptName, const char* funcName) { - logger::info("Real - GetGlobalFunctionNames of {}", scriptName); - std::vector functionNames; RE::BSTSmartPointer typeInfoPtr; RE::BSScript::Internal::VirtualMachine::GetSingleton()->GetScriptObjectType(RE::BSFixedString(scriptName), typeInfoPtr); auto functionCount = typeInfoPtr->GetNumGlobalFuncs(); diff --git a/source/scripts/_00e_playersetupscript.psc b/source/scripts/_00e_playersetupscript.psc index dafbeea5..03cf3ea0 100644 --- a/source/scripts/_00e_playersetupscript.psc +++ b/source/scripts/_00e_playersetupscript.psc @@ -45,11 +45,6 @@ Event OnInit() kQuest.Start() endwhile - If Game.GetModByName("Enderal_FS_More_Affinities.esp") != 255 - Game.QuitToMainMenu() - Debug.MessageBox("Enderal_FS_More_Affinities.esp is outdated and does not work with Enderal SE. Please, uninstall or update the mod.") - EndIf - EndEvent Event OnPlayerLoadGame()