source/Enderal DLL/CMakeLists.txt

@@ -6,27 +6,30 @@ message("Using toolchain file ${CMAKE_TOOLCHAIN_FILE}.")
 ########################################################################################################################
 project(
         EnderalSE
-        VERSION 2.1.2
+        VERSION 2.1.0
         DESCRIPTION "Enderal SE DLL"
         LANGUAGES CXX)
 set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON)
 
+include(GNUInstallDirs)
+
+find_path(SIMPLEINI_INCLUDE_DIRS "ConvertUTF.c")
+
 configure_file(
         ${CMAKE_CURRENT_SOURCE_DIR}/cmake/version.rc.in
         ${CMAKE_CURRENT_BINARY_DIR}/version.rc
         @ONLY)
-		
-#include(GNUInstallDirs)
-find_path(SIMPLEINI_INCLUDE_DIRS "ConvertUTF.c")
 
-file(
+set(sources
-  GLOB_RECURSE
+        src/Main.cpp
-  sources
+        src/EventListener.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp
+        src/Papyrus.cpp
-  ${CMAKE_CURRENT_BINARY_DIR}/version.rc
+        src/Patches/TweenMenuPatch.cpp
-)
+        src/Patches/HeroMenuPatch.cpp
+
+        ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
 
 source_group(
         TREE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -37,35 +40,10 @@ source_group(
 ########################################################################################################################
 ## Configure target DLL
 ########################################################################################################################
-
+find_package(CommonLibSSE CONFIG REQUIRED)
-include(FetchContent)
-FetchContent_Declare(
-    CommonLibNG
-    GIT_REPOSITORY https://github.com/alandtse/CommonLibVR.git
-    GIT_TAG 735fa6dae8ec72966ee02673dd689c6516d49f71
-)
-
-set(ENABLE_SKYRIM_SE ON CACHE BOOL " " FORCE)
-set(ENABLE_SKYRIM_AE ON CACHE BOOL " " FORCE)
-set(ENABLE_SKYRIM_VR ON CACHE BOOL " " FORCE)
-set(BUILD_TESTS OFF CACHE BOOL " " FORCE)
-
-#FetchContent_MakeAvailable(CommonLibNG)
-
-# Use a local copy instead
-add_subdirectory("d:/Git/CommonLibVR/" ${CMAKE_BINARY_DIR}/_deps/clib-build)
-
-#find_package(CommonLibSSE CONFIG REQUIRED)
-
-get_target_property(COMMONLIB_SRC_DIR CommonLibSSE SOURCE_DIR)
-
-include(${COMMONLIB_SRC_DIR}/cmake/CommonLibSSE.cmake)
 
 add_commonlibsse_plugin(${PROJECT_NAME} SOURCES ${headers} ${sources})
-
 add_library("${PROJECT_NAME}::${PROJECT_NAME}" ALIAS "${PROJECT_NAME}")
-target_link_libraries(${PROJECT_NAME} PUBLIC CommonLibSSE::CommonLibSSE)
-
 
 target_include_directories(${PROJECT_NAME}
         PRIVATE
@@ -79,15 +57,6 @@ target_include_directories(${PROJECT_NAME}
         PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
 
-find_package(spdlog CONFIG REQUIRED)
-
-target_link_libraries(
-	"${PROJECT_NAME}"
-	PUBLIC
-		spdlog::spdlog
-		Version.lib
-)
-
 target_precompile_headers(${PROJECT_NAME}
         PRIVATE
         src/PCH.h)
@@ -105,4 +74,3 @@ add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_SOURCE_DIR}/../../SKSE/Plugins/")
 add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${PROJECT_NAME}> "${CMAKE_CURRENT_SOURCE_DIR}/../../SKSE/Plugins/")
-		

source/Enderal DLL/src/CheckInvalidForms.h

@@ -668,8 +668,9 @@ inline void CheckSkyrimCells()
 
 inline void CheckCCMods()
 {
-	std::string filenames[73] = {
+	std::string filenames[74] = {
 		"ccASVSSE001-ALMSIVI.esm",
+		"ccBGSSSE001-Fish.esm",
 		"ccBGSSSE002-ExoticArrows.esl",
 		"ccBGSSSE003-Zombies.esl",
 		"ccBGSSSE004-RuinsEdge.esl",
@@ -744,17 +745,12 @@ inline void CheckCCMods()
 		"ccAFDSSE001-DweSanctuary.esm",
 	};
 
-	for (short i = 0; i < 73; i++) {
+	for (short i = 0; i < 74; i++) {
 		if (DataFileExists(filenames[i], 800)) {
 			MessageBoxW(NULL, L"Creation Club mods are incompatible with Enderal.", L"Error", MB_OK | MB_ICONERROR);
 			exit(EXIT_FAILURE);
 		}
 	}
-
-	if (DataFileExists("ccBGSSSE001-Fish.esm", 1200000)) {
-		MessageBoxW(NULL, L"Fishing CC are incompatible with Enderal without a patch.", L"Error", MB_OK | MB_ICONERROR);
-		exit(EXIT_FAILURE);
-	}
 }
 
 inline void CheckUnconvertedMap()

source/Enderal DLL/src/Patches/BinkInterruptPatch.h

@@ -13,7 +13,7 @@ namespace BinkInterruptPatch
 				return true;
 			}
 
-			if (REX::W32::GetKeyState(VK_SPACE) & 0x8000 || REX::W32::GetKeyState(VK_ESCAPE) & 0x8000 || REX::W32::GetKeyState(VK_LBUTTON) & 0x8000 || REX::W32::GetKeyState(VK_RBUTTON) & 0x8000 || REX::W32::GetKeyState(VK_LMENU) & 0x8000) {
+			if (SKSE::WinAPI::GetKeyState(VK_SPACE) & 0x8000 || SKSE::WinAPI::GetKeyState(VK_ESCAPE) & 0x8000 || SKSE::WinAPI::GetKeyState(VK_LBUTTON) & 0x8000 || SKSE::WinAPI::GetKeyState(VK_RBUTTON) & 0x8000 || SKSE::WinAPI::GetKeyState(VK_LMENU) & 0x8000) {
 				return false;
 			}
 

source/Enderal DLL/vcpkg-configuration.json

@@ -2,6 +2,19 @@
   "default-registry": {
     "kind": "git",
     "repository": "https://github.com/microsoft/vcpkg.git",
-    "baseline": "cacf5994341f27e9a14a7b8724b0634b138ecb30"
+    "baseline": "08c4e71048eb54733d9b180a28b9b1d7ce637454"
-  }
+  },
+  "registries": [
+    {
+      "kind": "git",
+      "repository": "https://gitlab.com/colorglass/vcpkg-colorglass",
+      "baseline": "6309841a1ce770409708a67a9ba5c26c537d2937",
+      "packages": [
+        "commonlibsse-ng",
+        "gluino",
+        "script-extender-common",
+        "skse"
+      ]
+    }
+  ]
 }

source/Enderal DLL/vcpkg.json

@@ -10,10 +10,8 @@
     "plugin": {
       "description": "Enderal SE functions and potion replacer.",
       "dependencies": [
-        "simpleini",
+        "commonlibsse-ng",
-        "spdlog",
+        "simpleini"
-        "directxtk",
-        "rapidcsv"
       ]
     }
   },