fix: add clang-cl support

qudix · qudix · commit e04ef4adc4cd · 2026-02-10T10:43:03.000-06:00
diff --git a/include/F4SE/Interfaces.h b/include/F4SE/Interfaces.h
@@ -234,7 +234,7 @@ namespace F4SE
 
 		[[nodiscard]] void* GetEventDispatcher(std::uint32_t a_dispatcherID) const
 		{
-			GetProxy().GetEventDispatcher(a_dispatcherID);
+			return GetProxy().GetEventDispatcher(a_dispatcherID);
 		}
 	};
 
diff --git a/include/RE/A/ActorUtils.h b/include/RE/A/ActorUtils.h
@@ -61,7 +61,7 @@ namespace RE
 		};
 		static_assert(sizeof(ArmorRatingVisitor) == 0x40);
 
-		static float GetEquippedArmorDamageResistance(Actor* a_actor, const ActorValueInfo* a_info)
+		static inline float GetEquippedArmorDamageResistance(Actor* a_actor, const ActorValueInfo* a_info)
 		{
 			using func_t = decltype(ActorUtils::GetEquippedArmorDamageResistance);
 			static REL::Relocation<func_t> func{ ID::ActorUtils::GetEquippedArmorDamageResistance };
diff --git a/include/RE/B/BGSCharacterTint.h b/include/RE/B/BGSCharacterTint.h
@@ -148,9 +148,9 @@ namespace RE
 			virtual EntryType GetType();                                                // 28
 
 			// Members
-			Entry*              templateEntry;  // 08
-			const std::uint16_t idLink;         // 10
-			std::uint8_t        tingingValue;   // 12
+			Entry*        templateEntry;  // 08
+			std::uint16_t idLink;         // 10
+			std::uint8_t  tingingValue;   // 12
 		};
 		static_assert(sizeof(Entry) == 0x18);
 
diff --git a/include/RE/B/BGSInventoryItem.h b/include/RE/B/BGSInventoryItem.h
@@ -84,7 +84,7 @@ namespace RE
 			{}
 
 			// override (StackDataCompareFunctor)
-			bool CompareData(const BGSInventoryItem::Stack&) override { return this->extra == extra; }
+			bool CompareData(const BGSInventoryItem::Stack&) override { return true; } // this->extra == extra; ??
 
 			// members
 			const ExtraDataList* extra;  // 08
@@ -212,7 +212,7 @@ namespace RE
 			return func(this, a_index);
 		}
 
-		[[nodiscard]] void MergeStacks()
+		void MergeStacks()
 		{
 			using func_t = decltype(&BGSInventoryItem::MergeStacks);
 			static REL::Relocation<func_t> func{ ID::BGSInventoryItem::MergeStacks };
diff --git a/include/RE/B/BSGraphics.h b/include/RE/B/BSGraphics.h
@@ -166,7 +166,7 @@ namespace RE
 			std::uint32_t                 id{ 0 };                  // 00
 			REX::W32::ID3D11DomainShader* shader{ nullptr };        // 08
 			std::uint32_t                 byteCodeSize{ 0 };        // 10
-			BSGraphics::ConstantGroup     constantBuffers[3]{ 0 };  // 18
+			BSGraphics::ConstantGroup     constantBuffers[3]{};     // 18
 			std::uint64_t                 shaderDesc{ 0 };          // 60
 			std::int8_t                   constantTable[32]{ 0 };   // 68
 		};
diff --git a/include/RE/B/BSScaleformTranslator.h b/include/RE/B/BSScaleformTranslator.h
@@ -4,7 +4,7 @@
 #include "RE/B/BSStreamParser.h"
 #include "RE/B/BSTranslator.h"
 #include "RE/S/Setting.h"
-#include "Scaleform/G/GFX_Translator.h"
+#include "Scaleform/G/GFx_Translator.h"
 
 namespace RE
 {
diff --git a/include/RE/B/BSScriptUtil.h b/include/RE/B/BSScriptUtil.h
@@ -7,6 +7,7 @@
 #include "RE/B/BSScript_Object.h"
 #include "RE/B/BSScript_ObjectTypeInfo.h"
 #include "RE/B/BSScript_StackFrame.h"
+#include "RE/B/BSScript_Struct.h"
 #include "RE/B/BSScript_TypeInfo.h"
 #include "RE/E/ENUM_FORM_ID.h"
 #include "RE/G/GameScript.h"
diff --git a/include/RE/B/BSScript_StructTypeInfo.h b/include/RE/B/BSScript_StructTypeInfo.h
@@ -2,6 +2,7 @@
 
 #include "RE/B/BSFixedString.h"
 #include "RE/B/BSScript_IComplexType.h"
+#include "RE/B/BSScript_ObjectTypeInfo.h"
 #include "RE/B/BSScript_TypeInfo.h"
 #include "RE/B/BSScript_Variable.h"
 #include "RE/B/BSTArray.h"
diff --git a/include/RE/B/BSStringT.h b/include/RE/B/BSStringT.h
@@ -153,10 +153,10 @@ namespace RE
 		size_type _capacity{ 0 };    // ??
 	};
 
-	using BSString = BSStringT<char, -1, DynamicMemoryManagementPol>;
+	using BSString = BSStringT<char, static_cast<std::uint16_t>(-1), DynamicMemoryManagementPol>;
 	static_assert(sizeof(BSString) == 0x10);
 
-	using BSStringW = BSStringT<wchar_t, -1, DynamicMemoryManagementPol>;
+	using BSStringW = BSStringT<wchar_t, static_cast<std::uint16_t>(-1), DynamicMemoryManagementPol>;
 	static_assert(sizeof(BSStringW) == 0x10);
 
 	template <std::uint16_t N>
diff --git a/include/RE/B/BSTEvent.h b/include/RE/B/BSTEvent.h
@@ -178,7 +178,7 @@ namespace RE
 			BSAutoLock l{ dataLock };
 			T          event;
 			event.optionalValue = optionalValue;
-			a_event.valueEventSink.ProcessEvent(event, nullptr);
+			return a_event.valueEventSink.ProcessEvent(event, nullptr);
 		}
 
 		// members
diff --git a/include/RE/B/BSTPointerAndFlags.h b/include/RE/B/BSTPointerAndFlags.h
@@ -43,7 +43,7 @@ namespace RE
 				clear_flags();
 				a_rhs.clear_flags();
 				_storage.address = a_rhs._storage.address;
-				a_rhs.storage.address = 0;
+				a_rhs._storage.address = 0;
 			}
 			return *this;
 		}
diff --git a/include/RE/B/BSTSmartPointer.h b/include/RE/B/BSTSmartPointer.h
@@ -22,7 +22,7 @@ namespace RE
 	class BSTSmartPointerAutoPtr
 	{
 	public:
-		constexpr static void Acquire(T* a_ptr) { return; }
+		constexpr static void Acquire(T*) { return; }
 		static void           Release(T* a_ptr) { delete a_ptr; }
 	};
 
diff --git a/include/RE/B/BaseExtraList.h b/include/RE/B/BaseExtraList.h
@@ -45,7 +45,7 @@ namespace RE
 			assert(a_type < EXTRA_DATA_TYPE::kTotal);
 			const auto idx = std::to_underlying(a_type) / 8;
 			const auto flags = GetFlags();
-			if (!flags.empty() && idx < flags.size()) {
+			if (!flags.empty() && static_cast<std::size_t>(idx) < flags.size()) {
 				const auto pos = static_cast<std::uint8_t>(1u << (std::to_underlying(a_type) % 8));
 				return (flags[idx] & pos) != 0;
 			} else {
diff --git a/include/RE/B/bhkCharacterController.h b/include/RE/B/bhkCharacterController.h
@@ -155,7 +155,7 @@ namespace RE
 		float                                                                   stepHeight;                 // 424
 		float                                                                   stepHeightMod;              // 428
 		float                                                                   stepHeightModTimer;         // 42C
-		const float                                                             castDepthC;                 // 430
+		float                                                                   castDepthC;                 // 430
 		std::uint32_t                                                           numCollisions;              // 434
 		std::uint32_t                                                           stickyCollisionGroup;       // 438
 		bool                                                                    allSurfacesStopped;         // 43C
diff --git a/include/RE/C/Calendar.h b/include/RE/C/Calendar.h
@@ -40,12 +40,6 @@ namespace RE
 		[[nodiscard]] float         GetHoursPassed() const noexcept;
 		[[nodiscard]] std::uint32_t GetMonth() const noexcept;
 
-		int64_t GetDaysPassed()
-		{
-			using func_t = decltype(&Calendar::GetDaysPassed);
-			REL::Relocation<func_t> func{ ID::Calendar::GetDaysPassed };
-		}
-
 		// members
 		TESGlobal*    gameYear;         // 08
 		TESGlobal*    gameMonth;        // 10
diff --git a/include/RE/F/FavoritesManager.h b/include/RE/F/FavoritesManager.h
@@ -74,7 +74,7 @@ namespace RE
 			return func(this, a_quickkeyIndex);
 		}
 
-		[[nodiscard]] void ClearCurrentAmmoCount()
+		void ClearCurrentAmmoCount()
 		{
 			using func_t = decltype(&FavoritesManager::ClearCurrentAmmoCount);
 			static REL::Relocation<func_t> func{ ID::FavoritesManager::ClearCurrentAmmoCount };
diff --git a/include/RE/H/hknpBodyId.h b/include/RE/H/hknpBodyId.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "RE/h/hkHandle.h"
+#include "RE/H/hkHandle.h"
 
 namespace RE
 {
diff --git a/include/RE/H/hknpShapeSignals.h b/include/RE/H/hknpShapeSignals.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "RE/h/hkSignal.h"
+#include "RE/H/hkSignal.h"
 
 namespace RE
 {
diff --git a/include/RE/I/IDEvent.h b/include/RE/I/IDEvent.h
@@ -24,7 +24,9 @@ namespace RE
 				return strUserEvent;
 			}
 
-			return "DISABLED"sv;
+			static const BSFixedString DISABLED{ "DISABLED" };
+
+			return DISABLED;
 		}
 
 		[[nodiscard]] const bool           QDisabled() const noexcept { return disabled; }
diff --git a/include/RE/L/LevelIncrease.h b/include/RE/L/LevelIncrease.h
@@ -14,7 +14,7 @@ namespace RE
 		};
 		static_assert(sizeof(Event) == 0x4);
 
-		[[nodiscard]] static BSTEventSource<LevelIncrease::Event>* GetEventSource()
+		[[nodiscard]] static inline BSTEventSource<LevelIncrease::Event>* GetEventSource()
 		{
 			using func_t = decltype(&LevelIncrease::GetEventSource);
 			static REL::Relocation<func_t> func{ ID::LevelIncrease::GetEventSource };
diff --git a/include/RE/M/Moon.h b/include/RE/M/Moon.h
@@ -34,18 +34,18 @@ namespace RE
 		};
 
 		// members
-		NiPointer<NiBillboardNode>                      moonBaseNode;          // 10
-		NiPointer<NiNode>                               moonNode;              // 18
-		NiPointer<NiNode>                               shadowNode;            // 20
-		NiPointer<BSTriShape>                           moonMesh;              // 28
-		NiPointer<BSTriShape>                           shadowMesh;            // 30
-		BSStringT<char, -1, DynamicMemoryManagementPol> textures[8];           // 38
-		float                                           angleFadeStart;        // B8
-		float                                           angleFadeEnd;          // BC
-		float                                           angleShadowEarlyFade;  // C0
-		float                                           speed;                 // C4
-		float                                           zOffset;               // C8
-		std::uint32_t                                   size;                  // CC
-		UpdateStatus                                    updateMoonTexture;     // D0
+		NiPointer<NiBillboardNode> moonBaseNode;          // 10
+		NiPointer<NiNode>          moonNode;              // 18
+		NiPointer<NiNode>          shadowNode;            // 20
+		NiPointer<BSTriShape>      moonMesh;              // 28
+		NiPointer<BSTriShape>      shadowMesh;            // 30
+		BSString                   textures[8];           // 38
+		float                      angleFadeStart;        // B8
+		float                      angleFadeEnd;          // BC
+		float                      angleShadowEarlyFade;  // C0
+		float                      speed;                 // C4
+		float                      zOffset;               // C8
+		std::uint32_t              size;                  // CC
+		UpdateStatus               updateMoonTexture;     // D0
 	};
 }
diff --git a/include/RE/N/NiCamera.h b/include/RE/N/NiCamera.h
@@ -45,7 +45,7 @@ namespace RE
 
 		bool PointInFrustum(const NiPoint3& a_point, float a_radius)
 		{
-			const NiBound bound{ a_point, a_radius };
+			const NiBound bound{ a_point, { a_radius } };
 			return BoundInFrustum(bound, this);
 		}
 
diff --git a/include/RE/N/NiCullingProcess.h b/include/RE/N/NiCullingProcess.h
@@ -42,9 +42,9 @@ namespace RE
 		virtual void AppendVirtual(BSGeometry* a_visible);                                                  // 1B
 
 		// members
-		const bool      useVirtualAppend;      // 08
+		bool            useVirtualAppend;      // 08
 		NiVisibleArray* visibleSet;            // 10
-		const NiCamera* camera;                // 18
+		NiCamera*       camera;                // 18
 		NiFrustum       frustum;               // 20
 		NiFrustumPlanes planes;                // 3C
 		NiFrustumPlanes customCullPlanes;      // AC
diff --git a/include/RE/P/PipboySubMenu.h b/include/RE/P/PipboySubMenu.h
@@ -26,8 +26,8 @@ namespace RE
 		virtual void UpdateData() = 0;  // 02
 
 		// members
-		Scaleform::GFx::Value& dataObj;  // 08
-		Scaleform::GFx::Value& menuObj;  // 10
+		Scaleform::GFx::Value* dataObj;  // 08
+		Scaleform::GFx::Value* menuObj;  // 10
 	};
 	static_assert(sizeof(PipboySubMenu) == 0x18);
 }
diff --git a/include/RE/S/SavefileMetadata.h b/include/RE/S/SavefileMetadata.h
@@ -13,20 +13,20 @@ namespace RE
 		}
 
 		// members
-		char                                            fileNameA[260];     // 00
-		REX::W32::FILETIME                              creationTimeStamp;  // 104
-		std::uint64_t                                   playerLevel;        // 110
-		std::uint32_t                                   filenameVersion;    // 118
-		std::uint32_t                                   saveGameNumber;     // 11C
-		std::uint64_t                                   playerID;           // 120
-		BSStringT<char, -1, DynamicMemoryManagementPol> playerName;         // 128
-		BSStringT<char, -1, DynamicMemoryManagementPol> playerLocID;        // 138
-		BSStringT<char, -1, DynamicMemoryManagementPol> playTime;           // 148
-		bool                                            isValid;            // 158
-		bool                                            hasSaveNumber;      // 159
-		bool                                            needsSync;          // 15A
-		bool                                            modded;             // 15B
-		bool                                            survival;           // 15C
+		char               fileNameA[260];     // 00
+		REX::W32::FILETIME creationTimeStamp;  // 104
+		std::uint64_t      playerLevel;        // 110
+		std::uint32_t      filenameVersion;    // 118
+		std::uint32_t      saveGameNumber;     // 11C
+		std::uint64_t      playerID;           // 120
+		BSString           playerName;         // 128
+		BSString           playerLocID;        // 138
+		BSString           playTime;           // 148
+		bool               isValid;            // 158
+		bool               hasSaveNumber;      // 159
+		bool               needsSync;          // 15A
+		bool               modded;             // 15B
+		bool               survival;           // 15C
 	};
 	static_assert(sizeof(SavefileMetadata) == 0x160);
 }
diff --git a/include/RE/S/Setting.h b/include/RE/S/Setting.h
@@ -377,7 +377,7 @@ namespace RE
 		static constexpr auto RTTI{ RTTI::GameSettingCollection };
 		static constexpr auto VTABLE{ VTABLE::GameSettingCollection };
 
-		[[nodiscard]] static void InitCollection()
+		static void InitCollection()
 		{
 			using func_t = decltype(&GameSettingCollection::InitCollection);
 			static REL::Relocation<func_t> func{ ID::Setting::GameSettingCollection::InitCollection };
diff --git a/include/RE/T/TESObjectCELL.h b/include/RE/T/TESObjectCELL.h
@@ -176,35 +176,35 @@ namespace RE
 			return func(this, pd);
 		}
 
-		[[nodiscard]] void SetCullCellMarkers(bool a_cull)
+		void SetCullCellMarkers(bool a_cull)
 		{
 			using func_t = decltype(&TESObjectCELL::SetCullCellMarkers);
 			static REL::Relocation<func_t> func{ ID::TESObjectCELL::SetCullCellMarkers };
 			return func(this, a_cull);
 		}
 
-		[[nodiscard]] void UpdateAllRefsLoaded()
+		void UpdateAllRefsLoaded()
 		{
 			using func_t = decltype(&TESObjectCELL::UpdateAllRefsLoaded);
 			static REL::Relocation<func_t> func{ ID::TESObjectCELL::UpdateAllRefsLoaded };
 			return func(this);
 		}
 
-		[[nodiscard]] void AttatchReference3D(TESObjectREFR* a_ref, bool a_onTop, bool a_queueAttatch)
+		void AttatchReference3D(TESObjectREFR* a_ref, bool a_onTop, bool a_queueAttatch)
 		{
 			using func_t = decltype(&TESObjectCELL::AttatchReference3D);
 			static REL::Relocation<func_t> func{ ID::TESObjectCELL::AttatchReference3D };
 			return func(this, a_ref, a_onTop, a_queueAttatch);
 		}
 
-		[[nodiscard]] void RemoveReference(TESObjectREFR* a_ref)
+		void RemoveReference(TESObjectREFR* a_ref)
 		{
 			using func_t = decltype(&TESObjectCELL::RemoveReference);
 			static REL::Relocation<func_t> func{ ID::TESObjectCELL::RemoveReference };
 			return func(this, a_ref);
 		}
 
-		[[nodiscard]] void UpdateAllDecals()
+		void UpdateAllDecals()
 		{
 			using func_t = decltype(&TESObjectCELL::UpdateAllDecals);
 			static REL::Relocation<func_t> func{ ID::TESObjectCELL::UpdateAllDecals };
diff --git a/include/Scaleform/G/GFx_ActionControl.h b/include/Scaleform/G/GFx_ActionControl.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Scaleform/F/Flags.h"
-#include "Scaleform/G/GFX_State.h"
+#include "Scaleform/G/GFx_State.h"
 
 namespace Scaleform::GFx
 {
diff --git a/lib/commonlib-shared b/lib/commonlib-shared
@@ -1 +1 @@
-Subproject commit debb5ad4dfa1678c67b28358834eed5b244a7c6f
+Subproject commit 3995dac7b31d5588f7c45d4cf6d025aed331371e
diff --git a/src/F4SE/API.cpp b/src/F4SE/API.cpp
@@ -30,11 +30,11 @@ namespace F4SE
 			std::string  pluginAuthor{};
 			REL::Version pluginVersion{};
 
-			REL::Version                                     f4seVersion{};
-			PluginHandle                                     pluginHandle{ static_cast<PluginHandle>(-1) };
-			std::uint32_t                                    releaseIndex{ 0 };
-			std::function<const void*(F4SEAPI)(const char*)> pluginInfoAccessor;
-			std::string_view                                 saveFolderName{};
+			REL::Version                            f4seVersion{};
+			PluginHandle                            pluginHandle{ static_cast<PluginHandle>(-1) };
+			std::uint32_t                           releaseIndex{ 0 };
+			std::function<const void*(const char*)> pluginInfoAccessor;
+			std::string_view                        saveFolderName{};
 
 			MessagingInterface*     messagingInterface{ nullptr };
 			ScaleformInterface*     scaleformInterface{ nullptr };
diff --git a/src/F4SE/Interfaces.cpp b/src/F4SE/Interfaces.cpp
diff --git a/xmake.lua b/xmake.lua

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ namespace F4SE`
`234`	`234`
`235`	`235`	`[[nodiscard]] void* GetEventDispatcher(std::uint32_t a_dispatcherID) const`
`236`	`236`	`{`
`237`		`- GetProxy().GetEventDispatcher(a_dispatcherID);`
	`237`	`+ return GetProxy().GetEventDispatcher(a_dispatcherID);`
`238`	`238`	`}`
`239`	`239`	`};`
`240`	`240`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ namespace RE`
`61`	`61`	`};`
`62`	`62`	`static_assert(sizeof(ArmorRatingVisitor) == 0x40);`
`63`	`63`
`64`		`- static float GetEquippedArmorDamageResistance(Actor* a_actor, const ActorValueInfo* a_info)`
	`64`	`+ static inline float GetEquippedArmorDamageResistance(Actor* a_actor, const ActorValueInfo* a_info)`
`65`	`65`	`{`
`66`	`66`	`using func_t = decltype(ActorUtils::GetEquippedArmorDamageResistance);`
`67`	`67`	`static REL::Relocation<func_t> func{ ID::ActorUtils::GetEquippedArmorDamageResistance };`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ namespace RE`
`84`	`84`	`{}`
`85`	`85`
`86`	`86`	`// override (StackDataCompareFunctor)`
`87`		`- bool CompareData(const BGSInventoryItem::Stack&) override { return this->extra == extra; }`
	`87`	`+ bool CompareData(const BGSInventoryItem::Stack&) override { return true; } // this->extra == extra; ??`
`88`	`88`
`89`	`89`	`// members`
`90`	`90`	`const ExtraDataList* extra; // 08`
`@@ -212,7 +212,7 @@ namespace RE`
`212`	`212`	`return func(this, a_index);`
`213`	`213`	`}`
`214`	`214`
`215`		`- [[nodiscard]] void MergeStacks()`
	`215`	`+ void MergeStacks()`
`216`	`216`	`{`
`217`	`217`	`using func_t = decltype(&BGSInventoryItem::MergeStacks);`
`218`	`218`	`static REL::Relocation<func_t> func{ ID::BGSInventoryItem::MergeStacks };`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#include "RE/B/BSStreamParser.h"`
`5`	`5`	`#include "RE/B/BSTranslator.h"`
`6`	`6`	`#include "RE/S/Setting.h"`
`7`		`-#include "Scaleform/G/GFX_Translator.h"`
	`7`	`+#include "Scaleform/G/GFx_Translator.h"`
`8`	`8`
`9`	`9`	`namespace RE`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ namespace RE`
`178`	`178`	`BSAutoLock l{ dataLock };`
`179`	`179`	`T event;`
`180`	`180`	`event.optionalValue = optionalValue;`
`181`		`- a_event.valueEventSink.ProcessEvent(event, nullptr);`
	`181`	`+ return a_event.valueEventSink.ProcessEvent(event, nullptr);`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`// members`