Merge pull request #20 from qudix/dev

feat: misc
shad0wshayd3-FO4 · Jun 9, 2024 · 6612991 · 6612991
2 parents a4145f7 + 55030ee
commit 6612991
Show file tree

Hide file tree

Showing 144 changed files with 1,731 additions and 1,059 deletions.
diff --git a/CommonLibF4/cmake/sourcelist.cmake b/CommonLibF4/cmake/sourcelist.cmake
@@ -284,9 +284,7 @@ set(SOURCES
 	include/RE/NetImmerse/NiNode.h
 	include/RE/NetImmerse/NiObject.h
 	include/RE/NetImmerse/NiObjectNET.h
-	include/RE/NetImmerse/NiPoint2.h
-	include/RE/NetImmerse/NiPoint3.h
-	include/RE/NetImmerse/NiPoint4.h
+	include/RE/NetImmerse/NiPoint.h
 	include/RE/NetImmerse/NiProperty.h
 	include/RE/NetImmerse/NiQuaternion.h
 	include/RE/NetImmerse/NiRTTI.h
@@ -434,8 +432,9 @@ set(SOURCES
 	src/RE/Fallout.cpp
 	src/RE/NetImmerse/NiAVObject.cpp
 	src/RE/NetImmerse/NiBinaryStream.cpp
+	src/RE/NetImmerse/NiMatrix3.cpp
 	src/RE/NetImmerse/NiObjectNET.cpp
-	src/RE/NetImmerse/NiPoint3.cpp
+	src/RE/NetImmerse/NiPoint.cpp
 	src/RE/NetImmerse/NiRect.cpp
 	src/RE/Scaleform/GFx/GFx_Player.cpp
 	src/REL/IAT.cpp

diff --git a/CommonLibF4/include/RE/Bethesda/ActiveEffect.h b/CommonLibF4/include/RE/Bethesda/ActiveEffect.h
@@ -57,7 +57,7 @@ namespace RE
 		bool CheckDisplacementSpellOnTarget()
 		{
 			using func_t = decltype(&ActiveEffect::CheckDisplacementSpellOnTarget);
-			REL::Relocation<func_t> func{ REL::ID(1415178) };
+			static REL::Relocation<func_t> func{ REL::ID(1415178) };
 			return func(this);
 		}