fix #15

powerof3 · Jul 24, 2024 · 25b70d6 · 25b70d6
1 parent ee4f784
commit 25b70d6
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -26,4 +26,4 @@ jobs:
       FOMOD_AE_MIN_GAME_VERSION: '1.6'
       FOMOD_REQUIRED_INSTALLATION_DIR: "Skyrim/Data"
       PUBLISH_ARCHIVE_TYPE: '7z'
-      VCPKG_COMMIT_ID: '14b91796a68c87bc8d5cb35911b39287ccb7bd95'
+      VCPKG_COMMIT_ID: 'ee1093857f3d16b007065542bbb2229369c70c2e'
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.20)
 set(NAME "po3_Tweaks" CACHE STRING "")
-set(VERSION 1.10.1 CACHE STRING "")
+set(VERSION 1.10.2 CACHE STRING "")
 set(AE_VERSION 1)
 set(VR_VERSION 1)
 

diff --git a/extern/CommonLibSSE b/extern/CommonLibSSE
diff --git a/extern/CommonLibVR b/extern/CommonLibVR
diff --git a/src/Fixes/ValidateScreenshotFolder.cpp b/src/Fixes/ValidateScreenshotFolder.cpp
@@ -40,12 +40,13 @@ namespace Fixes::ValidateScreenshotFolder
 			if (emptyPath) {
 				screenshotFolder = gameDirectory;
 				newBaseName = "Screenshot";
-			} else {
+			} else {			
 				screenshotFolder = folder;
 				screenshotFolder.make_preferred();
 
 				if (has_root_directory(screenshotFolder)) {
-					if (!is_subpath(screenshotFolder, gameDirectory) && !std::filesystem::exists(screenshotFolder)) {
+					std::error_code ec;
+					if (!is_subpath(screenshotFolder, gameDirectory) && !std::filesystem::exists(screenshotFolder, ec)) {
 						newBaseName = "Screenshot";
 					}
 				} else {
@@ -65,12 +66,12 @@ namespace Fixes::ValidateScreenshotFolder
 				}
 				RE::ConsoleLog::GetSingleton()->Print(std::format("[po3 Tweaks] Defaulting to {} folder\n", gameDirectory.string()).c_str());
 				if (emptyPath) {
-					logger::info("\t\tValidated screenshot location ({})"sv, screenshotFolder.string());
+					logger::info("\t\t[Screenshot Location Fix] '' -> {}"sv, screenshotFolder.string());
 				} else {
-					logger::info("\t\tValidated screenshot location ({} -> {})"sv, screenshotFolder.string(), gameDirectory.string());
+					logger::info("\t\t[Screenshot Location Fix] {} -> {}"sv, screenshotFolder.string(), gameDirectory.string());
 				}
 			} else {
-				logger::info("\t\tValidated screenshot location ({})"sv, screenshotFolder.string());
+				logger::info("\t\t[Screenshot Location Fix] No fixes required ({})"sv, folder);
 			}
 		}
 	}

diff --git a/vcpkg.json b/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "po3tweaks",
-  "version-string": "1.10.1",
+  "version-string": "1.10.2",
   "description": "Collection of bug fixes and tweaks for Skyrim SE/AE/VR",
   "homepage": "https://github.com/powerof3/po3-Tweaks/",
   "license": "MIT",
+16 −0		cmake/sourcelist.cmake
+3 −0		include/RE/A/AIFormulas.h
+2 −2		include/RE/A/Actor.h
+1 −0		include/RE/A/AttackBlockHandler.h
+4 −2		include/RE/A/ahkpWorld.h
+7 −6		include/RE/B/BSSceneGraph.h
+15 −13		include/RE/B/BookMenu.h
+27 −0		include/RE/B/bhkAction.h
+98 −79		include/RE/B/bhkCharacterController.h
+26 −0		include/RE/B/bhkMouseSpringAction.h
+6 −4		include/RE/B/bhkRigidBody.h
+28 −0		include/RE/B/bhkTelekinesisListener.h
+25 −0		include/RE/B/bhkUnaryAction.h
+9 −0		include/RE/C/ConcreteFormFactory.h
+7 −0		include/RE/C/CraftingMenu.h
+22 −0		include/RE/D/DamageImpactData.h
+2 −2		include/RE/D/DialogueItem.h
+69 −0		include/RE/G/GarbageCollector.h
+6 −6		include/RE/H/HeldStateHandler.h
+26 −0		include/RE/H/hkContactPointMaterial.h
+5 −5		include/RE/H/hkpAction.h
+2 −2		include/RE/H/hkpArrayAction.h
+17 −0		include/RE/H/hkpContactPointProperties.h
+2 −2		include/RE/H/hkpEaseConstraintsAction.h
+24 −0		include/RE/H/hkpEntity.h
+3 −6		include/RE/H/hkpMotion.h
+34 −0		include/RE/H/hkpMouseSpringAction.h
+19 −0		include/RE/H/hkpProperty.h
+4 −0		include/RE/H/hkpRigidBody.h
+2 −3		include/RE/H/hkpSolverResults.h
+25 −0		include/RE/H/hkpUnaryAction.h
+8 −4		include/RE/H/hkpWorldObject.h
+2 −0		include/RE/I/IFormFactory.h
+5 −5		include/RE/I/IMenu.h
+5 −3		include/RE/I/Inventory3DManager.h
+4 −0		include/RE/M/MagicSystem.h
+2 −2		include/RE/M/MapMenu.h
+2 −1		include/RE/M/MiddleHighProcessData.h
+3 −1		include/RE/N/NiAVObject.h
+1 −1		include/RE/N/NiBillboardNode.h
+2 −3		include/RE/N/NiCamera.h
+9 −9		include/RE/P/PlayerInputHandler.h
+27 −0		include/RE/R/REFREventCallbacks.h
+1 −0		include/RE/R/ReadyWeaponHandler.h
+7 −8		include/RE/R/Renderer.h
+7 −0		include/RE/S/SleepWaitMenu.h
+54 −28		include/RE/S/State.h
+13 −0		include/RE/Skyrim.h
+19 −0		include/RE/T/TESBookReadEvent.h
+2 −0		include/RE/T/TESHavokUtilities.h
+7 −13		include/RE/T/TESObjectREFR.h
+1 −1		include/RE/T/TESTopicInfo.h
+32 −0		include/RE/T/TESTopicInfoEvent.h
+6 −4		include/RE/T/TelekinesisEffect.h
+9 −0		src/RE/A/AIFormulas.cpp
+14 −14		src/RE/A/Actor.cpp
+7 −0		src/RE/B/bhkRigidBody.cpp
+16 −0		src/RE/H/HeldStateHandler.cpp
+70 −0		src/RE/H/hkpProperty.cpp
+22 −0		src/RE/H/hkpRigidBody.cpp
+35 −0		src/RE/H/hkpWorldObject.cpp
+26 −12		src/RE/I/Inventory3DManager.cpp
+1 −1		src/RE/I/InventoryChanges.cpp
+9 −0		src/RE/M/MagicSystem.cpp
+16 −2		src/RE/N/NiAVObject.cpp
+13 −6		src/RE/N/NiCamera.cpp
+7 −4		src/RE/R/Renderer.cpp
+14 −0		src/RE/T/TESHavokUtilities.cpp
+33 −7		src/RE/T/TESObjectREFR.cpp
+1 −2		src/RE/T/TESTopicInfo.cpp