v0.34

SkyHorizon3 · Jun 22, 2024 · 67a2008 · 67a2008
1 parent 8bb6386
commit 67a2008
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 649 deletions.
diff --git a/!Update.ps1 b/!Update.ps1
diff --git a/.clang-format b/.clang-format
diff --git a/.gitattributes b/.gitattributes
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.21)
-project(MaxsuPoise VERSION 0.3.2 LANGUAGES CXX)
+project(MaxsuPoise VERSION 0.3.4 LANGUAGES CXX)
 
 # Set your project version and specify C++ standard
 set(CMAKE_CXX_STANDARD 23)

diff --git a/extern/CommonLibSSE-NG b/extern/CommonLibSSE-NG
diff --git a/src/SettingsHandler.cpp b/src/SettingsHandler.cpp
@@ -29,10 +29,14 @@ namespace MaxsuPoise
 		auto& WeapTypeEnumTbl = dku::static_enum<WEAPON_TYPE>();
 
 		CSimpleIniA ini;
-		ini.LoadFile(fileName);  // Load the ini file
+		if (ini.LoadFile(fileName))  // Load the ini file
+			ERROR("Get Error When loading file {}", fileName);
 
 		// get a pointer to the "WeaponTypeMult" section
 		const CSimpleIniA::TKeyVal* section = ini.GetSection("WeaponTypeMult");
+		if (!section) {
+			return;
+		}
 
 		// iterate through the key-value pairs in the section
 		for (CSimpleIniA::TKeyVal::const_iterator it = section->begin(); it != section->end(); ++it) {
@@ -52,10 +56,14 @@ namespace MaxsuPoise
 		auto& BipeSlotEnumTbl = dku::static_enum<BipedSlot>();
 
 		CSimpleIniA ini;
-		ini.LoadFile(armorSlotFile);  // Load the ini file
+		if (ini.LoadFile(armorSlotFile))  // Load the ini file
+			ERROR("Get Error When loading file {}", armorSlotFile);
 
 		// get a pointer to the "ArmorSlotMult" section
 		const CSimpleIniA::TKeyVal* section = ini.GetSection("ArmorSlotMult");
+		if (!section) {
+			return;
+		}
 
 		// iterate through the key-value pairs in the section
 		for (CSimpleIniA::TKeyVal::const_iterator it = section->begin(); it != section->end(); ++it) {

diff --git a/src/StaggerHandler.cpp b/src/StaggerHandler.cpp
@@ -83,6 +83,13 @@ namespace MaxsuPoise
 		if (!a_target)
 			return;
 
+		if (a_staggerMult <= 0.f) {
+			return;
+		}
+
+		if (a_target == a_aggressor)
+			a_aggressor = nullptr;
+
 		auto staggerProtectTime = StaggerProtectHandler::GetStaggerProtectTimer(a_target);
 		if (staggerProtectTime > 0.f && a_target->IsStaggering())
 			return;

diff --git a/src/Utils.cpp b/src/Utils.cpp
@@ -28,7 +28,7 @@ namespace MaxsuPoise
 		if (!a_target || !a_target->GetActorRuntimeData().race)
 			return 0.f;
 
-		return a_target->GetActorRuntimeData().race->data.baseMass;
+		return a_target->AsActorValueOwner()->GetActorValue(RE::ActorValue::kMass);
 	}
 
 	void CPrint(const char* a_fmt, ...)

diff --git a/vcpkg.json b/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "maxsupoise",
-  "version-semver": "0.3.2",
+  "version-semver": "0.3.4",
   "description": "",
   "license": "MIT",
   "dependencies": [
+8 −0		include/REL/ID.h
+19 −0		src/REL/ID.cpp
+2 −2		xmake.lua