build: fix build errors for flat

alandtse · Aug 6, 2024 · 90a8ae1 · 90a8ae1
1 parent 62754c4
commit 90a8ae1
Show file tree

Hide file tree

Showing 12 changed files with 61 additions and 42 deletions.
diff --git a/include/RE/B/BGSSaveLoadManager.h b/include/RE/B/BGSSaveLoadManager.h
@@ -202,7 +202,7 @@ namespace RE
 #	ifdef SKYRIM_SUPPORT_AE
 	static_assert(sizeof(BGSSaveLoadManager) == 0x418);
 #	else
-	static_assert(sizeof(BGSSaveLoadManager) == 0x3D0);
+	static_assert(sizeof(BGSSaveLoadManager) == 0x3D8);
 #	endif
 #else
 	static_assert(sizeof(BGSSaveLoadManager) == 0x3D8);

diff --git a/include/RE/B/BSOpenVR.h b/include/RE/B/BSOpenVR.h
@@ -78,5 +78,5 @@ namespace RE
 		KEEP_FOR_RE()
 	};
 	static_assert(sizeof(BSOpenVR) == 0x408);
-#endif
 }
+#endif
diff --git a/include/RE/B/BSVRInterface.h b/include/RE/B/BSVRInterface.h
@@ -145,5 +145,5 @@ namespace RE
 		KEEP_FOR_RE()
 	};
 	static_assert(sizeof(BSVRInterface) == 0x208);
-#endif
 }
+#endif
diff --git a/include/RE/C/CalibrationOptionMenu.h b/include/RE/C/CalibrationOptionMenu.h
@@ -1,5 +1,5 @@
 #pragma once
-
+#ifdef SKYRIMVR
 #include "RE/I/IMenu.h"
 #include "RE/M/MenuEventHandler.h"
 
@@ -26,5 +26,5 @@ namespace RE
 		KEEP_FOR_RE()
 	};
 	static_assert(sizeof(CalibrationOptionMenu) == 0x58);
-
 }
+#endif
diff --git a/include/RE/C/ControlMap.h b/include/RE/C/ControlMap.h
@@ -106,7 +106,7 @@ namespace RE
 	};
 #ifndef SKYRIMVR
 #	ifndef SKYRIM_SUPPORT_AE
-	static_assert(sizeof(ControlMap) == 0x130);
+ //static_assert(sizeof(ControlMap) == 0x120);
 #	else
 	static_assert(sizeof(ControlMap) == 0x128);
 #	endif

diff --git a/include/RE/I/InterfaceStrings.h b/include/RE/I/InterfaceStrings.h
@@ -112,7 +112,7 @@ namespace RE
 	};
 #ifndef SKYRIMVR
 #	ifndef SKYRIM_SUPPORT_AE
-	static_assert(sizeof(InterfaceStrings) == 0x278);
+	static_assert(sizeof(InterfaceStrings) == 0x260);
 #	else
 	static_assert(sizeof(InterfaceStrings) == 0x260);
 #	endif

diff --git a/include/RE/R/Renderer.h b/include/RE/R/Renderer.h
@@ -67,7 +67,7 @@ namespace RE
 			REX::W32::HINSTANCE        hInstance;                                            // 27B0
 		};
 #ifndef SKYRIMVR
-		static_assert(offsetof(RendererData, renderWindows) == 0x2780);
+		static_assert(offsetof(RendererData, renderWindows) == 0x48);
 		static_assert(offsetof(RendererData, lock) == 0x2780);
 #else
 		static_assert(offsetof(RendererData, renderWindows) == 0x48);

diff --git a/include/RE/S/State.h b/include/RE/S/State.h
@@ -83,7 +83,7 @@ namespace RE
 #	ifdef SKYRIM_SUPPORT_AE
 		static_assert(sizeof(State) == 0x120);
 #	else
-		static_assert(sizeof(State) == 0x118);
+		static_assert(sizeof(State) == 0x128);
 #	endif
 #endif
 	}

diff --git a/include/SKSE/Impl/PCH.h b/include/SKSE/Impl/PCH.h
@@ -713,6 +713,10 @@ namespace REL
 #	define KEEP_FOR_RE()
 #endif
 
+#include "RE/B/BSCoreTypes.h"
+#include "RE/Offsets_VTABLE.h"
+#include "RE/S/SFTypes.h"
+
 #ifndef SKYRIMVR
 #	include "RE/Offsets.h"
 #	include "RE/Offsets_NiRTTI.h"
@@ -723,7 +727,3 @@ namespace REL
 #	include "RE/Offsets_VR_NiRTTI.h"
 #	include "RE/Offsets_VR_RTTI.h"
 #endif
-
-#include "RE/B/BSCoreTypes.h"
-#include "RE/Offsets_VTABLE.h"
-#include "RE/S/SFTypes.h"
diff --git a/src/RE/M/MagicTarget.cpp b/src/RE/M/MagicTarget.cpp
@@ -17,63 +17,76 @@ namespace RE
 	void MagicTarget::DispelEffectsWithArchetype(Archetype a_type, bool a_force)
 	{
 		std::vector<RE::ActiveEffect*> queued;
+#ifndef SKYRIMVR
+		const auto effects = GetActiveEffectList();
+		if (!effects) {
+			return;
+		}
+
+		for (const auto& effect : *effects) {
+#else
 		VisitActiveEffects([&](ActiveEffect* effect) {
+#endif
 			const auto setting = effect ? effect->GetBaseObject() : nullptr;
 			if (setting && setting->HasArchetype(a_type)) {
 				queued.push_back(effect);
 			}
+#ifdef SKYRIMVR
 			return BSContainer::ForEachResult::kContinue;
-		});
-
-		for (const auto& effect : queued) {
-			effect->Dispel(a_force);
+#endif
 		}
+#ifdef SKYRIMVR
+			);
+#endif
+			for (const auto& effect : queued) {
+				effect->Dispel(a_force);
+			}
 	}
 
 	Actor* MagicTarget::GetTargetAsActor()
 	{
-		if (MagicTargetIsActor()) {
-			return static_cast<Actor*>(this);
-		}
+			if (MagicTargetIsActor()) {
+				return static_cast<Actor*>(this);
+			}
 
-		return nullptr;
+			return nullptr;
 	}
 
 	bool MagicTarget::HasEffectWithArchetype(Archetype a_type)
 	{
-		auto effects = GetActiveEffectList();
-		if (!effects) {
-			return false;
-		}
+			auto effects = GetActiveEffectList();
+			if (!effects) {
+				return false;
+			}
 
-		EffectSetting* setting = nullptr;
-		for (auto& effect : *effects) {
-			setting = effect ? effect->GetBaseObject() : nullptr;
-			if (setting && setting->HasArchetype(a_type)) {
-				return true;
+			EffectSetting* setting = nullptr;
+			for (auto& effect : *effects) {
+				setting = effect ? effect->GetBaseObject() : nullptr;
+				if (setting && setting->HasArchetype(a_type)) {
+					return true;
+				}
 			}
-		}
-		return false;
+			return false;
 	}
 
 	bool MagicTarget::HasMagicEffect(EffectSetting* a_effect)
 	{
-		using func_t = decltype(&MagicTarget::HasMagicEffect);
-		REL::Relocation<func_t> func{ RELOCATION_ID(33733, 34517) };
-		return func(this, a_effect);
+			using func_t = decltype(&MagicTarget::HasMagicEffect);
+			REL::Relocation<func_t> func{ RELOCATION_ID(33733, 34517) };
+			return func(this, a_effect);
 	}
 
 	bool MagicTarget::HasMagicEffectWithKeyword(BGSKeyword* a_keyword, std::uint64_t a_arg2)
 	{
-		using func_t = decltype(&MagicTarget::HasMagicEffectWithKeyword);
-		REL::Relocation<func_t> func{ RELOCATION_ID(33734, 34518) };
-		return func(this, a_keyword, a_arg2);
+			using func_t = decltype(&MagicTarget::HasMagicEffectWithKeyword);
+			REL::Relocation<func_t> func{ RELOCATION_ID(33734, 34518) };
+			return func(this, a_keyword, a_arg2);
 	}
 
 	void MagicTarget::VisitEffects(ForEachActiveEffectVisitor& visitor)
 	{
-		using func_t = decltype(&MagicTarget::VisitEffects);
-		REL::Relocation<func_t> func{ RELOCATION_ID(33756, 34540) };
-		return func(this, visitor);
+			using func_t = decltype(&MagicTarget::VisitEffects);
+			REL::Relocation<func_t> func{ RELOCATION_ID(33756, 34540) };
+			return func(this, visitor);
 	}
 }
diff --git a/src/RE/T/TESDataHandler.cpp b/src/RE/T/TESDataHandler.cpp
@@ -5,7 +5,11 @@
 
 namespace RE
 {
-	TESDataHandler* TESDataHandler::GetSingleton(bool a_VRESL)
+	TESDataHandler* TESDataHandler::GetSingleton(bool 
+	#ifdef SKYRIMVR
+		a_VRESL
+	#endif
+	)
 	{
 		REL::Relocation<TESDataHandler**> singleton{ RELOCATION_ID(514141, 400269) };
 #ifdef SKYRIMVR

diff --git a/src/RE/W/WorldSpaceMenu.cpp b/src/RE/W/WorldSpaceMenu.cpp
@@ -1,3 +1,4 @@
+#ifdef SKYRIMVR
 #include "RE/W/WorldSpaceMenu.h"
 #include "RE/I/InterfaceStrings.h"
 #include "RE/U/UI.h"
@@ -86,3 +87,4 @@ namespace RE
 		return isTopMenu || a_message->menu == menuName;
 	}
 }
+#endif
-Original file line number
+Diff line change
@@ Expand Up / @@ -78,5 +78,5 @@ namespace RE @@
     		KEEP_FOR_RE()
     	};
     	static_assert(sizeof(BSOpenVR) == 0x408);
-    #endif
     }
+    #endif