fix: vr specific changes with merge

FlayaN · FlayaN · commit b75853e0d0d2 · 2024-12-16T23:18:51.000+01:00
diff --git a/include/RE/A/Actor.h b/include/RE/A/Actor.h
@@ -124,12 +124,12 @@ namespace RE
 
 	class Actor :
 		public TESObjectREFR,                              // 000
-		public MagicTarget,                                // 0A0
-		public ActorValueOwner,                            // 0B8
-		public ActorState,                                 // 0C0
-		public BSTEventSink<BSTransformDeltaEvent>,        // 0D0
-		public BSTEventSink<bhkCharacterMoveFinishEvent>,  // 0D8
-		public IPostAnimationChannelUpdateFunctor          // 0E0
+		public MagicTarget,                                // 098
+		public ActorValueOwner,                            // 0B0
+		public ActorState,                                 // 0B8
+		public BSTEventSink<BSTransformDeltaEvent>,        // 0C8
+		public BSTEventSink<bhkCharacterMoveFinishEvent>,  // 0D0
+		public IPostAnimationChannelUpdateFunctor          // 0D8
 	{
 	private:
 		using EntryPoint = BGSEntryPointPerkEntry::EntryPoint;
diff --git a/include/RE/B/BGSEntryPoint.h b/include/RE/B/BGSEntryPoint.h
@@ -143,7 +143,7 @@ namespace RE
 		static EntryPoint* GetEntryPoint(ENTRY_POINT a_entryPoint)
 		{
 			if (a_entryPoint < ENTRY_POINT::kTotal) {
-				REL::Relocation<EntryPoint*> entryPoints{ RELOCATION_ID(675707, 368994) };  //TODO: Verify SSE ID against VR
+				static REL::Relocation<EntryPoint*> entryPoints{ RELOCATION_ID(675707, 368994) };  //TODO: Verify SSE ID against VR
 				return &entryPoints.get()[a_entryPoint];
 			}
 
diff --git a/include/RE/B/BGSEntryPointFunction.h b/include/RE/B/BGSEntryPointFunction.h
@@ -65,7 +65,7 @@ namespace RE
 		static std::uint32_t GetArgumentCount(ENTRY_POINT_FUNCTION_TYPE a_entryPointFunctionType)
 		{
 			if (a_entryPointFunctionType < ENTRY_POINT_FUNCTION_TYPE::kTotal) {
-				REL::Relocation<std::uint32_t*> entryPointFunctionTypeArgumentCount{ REL::ID(369210) };
+				static REL::Relocation<std::uint32_t*> entryPointFunctionTypeArgumentCount{ REL::ID(369210) };
 				return entryPointFunctionTypeArgumentCount.get()[a_entryPointFunctionType];
 			}
 
@@ -75,7 +75,7 @@ namespace RE
 		static EntryPointFunction* GetEntryPointFunction(ENTRY_POINT_FUNCTION a_entryPointFunction)
 		{
 			if (a_entryPointFunction < ENTRY_POINT_FUNCTION::kTotal) {
-				REL::Relocation<EntryPointFunction*> entryPointFunctions{ REL::ID(369178) };
+				static REL::Relocation<EntryPointFunction*> entryPointFunctions{ REL::ID(369178) };
 				return &entryPointFunctions.get()[a_entryPointFunction];
 			}
 
diff --git a/include/RE/B/BSCompoundFrustum.h b/include/RE/B/BSCompoundFrustum.h
@@ -21,6 +21,8 @@ namespace RE
 		uint32_t        unkBC;          // BC
 		uint32_t        unkC0;          // C0
 		uint16_t        unkC4;          // C4
+	private:
+		KEEP_FOR_RE()
 	};
 	static_assert(sizeof(BSCompoundFrustum) == 0xC8);
 }
diff --git a/include/RE/B/BSOcclusionBox.h b/include/RE/B/BSOcclusionBox.h
@@ -46,6 +46,8 @@ namespace RE
 		uint64_t        unk1D0;            // 1D0
 		uint64_t        unk1D8;            // 1D8
 		uint64_t        unk1E0;            // 1E0
+	private:
+		KEEP_FOR_RE()
 	};
 	static_assert(sizeof(BSOcclusionBox) == 0x1E8);
 }
diff --git a/include/RE/B/BSOcclusionPlane.h b/include/RE/B/BSOcclusionPlane.h
@@ -24,6 +24,8 @@ namespace RE
 		// members
 		NiPoint2          size;     // 48
 		BSCompoundFrustum frustum;  // 50
+	private:
+		KEEP_FOR_RE()
 	};
 	static_assert(sizeof(BSOcclusionPlane) == 0x118);
 }
diff --git a/include/RE/B/BSOcclusionShape.h b/include/RE/B/BSOcclusionShape.h
@@ -28,6 +28,8 @@ namespace RE
 		NiMatrix3 rotation;     // 1C
 		float     unk40;        // 40
 		bool      unk44;        // 44
+	private:
+		KEEP_FOR_RE()
 	};
 	static_assert(sizeof(BSOcclusionShape) == 0x48);
 }
diff --git a/include/RE/B/BSParabolicCullingProcess.h b/include/RE/B/BSParabolicCullingProcess.h
@@ -30,6 +30,8 @@ namespace RE
 		NiPoint3                       lightPosition;              // 30218
 		float                          lightRadius;                // 30224
 		NiPointer<NiCamera>            lightCamera;                // 30228
+	private:
+		KEEP_FOR_RE()
 	};
 	static_assert(sizeof(BSParabolicCullingProcess) == 0x30230);
 }
diff --git a/include/RE/B/BSPortal.h b/include/RE/B/BSPortal.h
@@ -24,6 +24,8 @@ namespace RE
 		BSMultiBoundRoom*             entranceRoom;      // 118
 		BSMultiBoundRoom*             exitRoom;          // 120
 		NiPointer<BSPortalSharedNode> portalSharedNode;  // 128
+	private:
+		KEEP_FOR_RE()
 	};
 	static_assert(sizeof(BSPortal) == 0x130);
 }
diff --git a/include/RE/B/BSPortalGraphEntry.h b/include/RE/B/BSPortalGraphEntry.h
@@ -27,6 +27,8 @@ namespace RE
 		BSCompoundFrustum                       compoundFrustum;  // 68
 		uint64_t                                unk130;           // 130
 		uint32_t                                cellId;           // 138
+	private:
+		KEEP_FOR_RE()
 	};
 	static_assert(sizeof(BSPortalGraphEntry) == 0x140);
 }
diff --git a/include/RE/B/BSResource.h b/include/RE/B/BSResource.h
@@ -9,14 +9,14 @@ namespace RE
 		inline void RegisterGlobalPath(const char* a_path)
 		{
 			using func_t = decltype(&RegisterGlobalPath);
-			REL::Relocation<func_t> func{ RELOCATION_ID(68480, 69833) };  //TODO: Verify SSE
+			static REL::Relocation<func_t> func{ RELOCATION_ID(68480, 69833) };  //TODO: Verify SSE
 			return func(a_path);
 		}
 
 		inline void RegisterLocation(Location* a_location, std::uint32_t a_priority)
 		{
 			using func_t = decltype(&RegisterLocation);
-			REL::Relocation<func_t> func{ RELOCATION_ID(68476, 69829) };  //TODO: Verify SSE
+			static REL::Relocation<func_t> func{ RELOCATION_ID(68476, 69829) };  //TODO: Verify SSE
 			return func(a_location, a_priority);
 		}
 	}
diff --git a/include/RE/B/BSTimer.h b/include/RE/B/BSTimer.h
@@ -31,9 +31,11 @@ namespace RE
 		}
 
 		// members
-		std::uint64_t unk00;                          // 00
-		std::uint32_t lastPerformanceCount;           // 08
-		std::uint32_t pad0C;                          // 0C
+		std::uint64_t unk00;                 // 00
+		std::uint32_t lastPerformanceCount;  // 08
+#ifndef SKYRIMVR
+		std::uint32_t pad0C;  // 0C
+#endif
 		float         clamp;                          // 10
 		float         clampRemainder;                 // 14
 		float         delta;                          // 18
diff --git a/include/RE/C/ConcreteFormFactory.h b/include/RE/C/ConcreteFormFactory.h
@@ -42,6 +42,6 @@ namespace RE
 		auto factory = IFormFactory::GetConcreteFormFactoryByType<T>();
 		auto form = factory ? factory->Create() : nullptr;
 
-		return form ? form->template As<T>() : nullptr;
+		return form ? form->As<T>() : nullptr;
 	}
 }
diff --git a/include/RE/H/HUDMenu.h b/include/RE/H/HUDMenu.h
@@ -105,14 +105,14 @@ namespace RE
 		static void FlashMeter(ActorValue a_actorValue)
 		{
 			using func_t = decltype(&HUDMenu::FlashMeter);
-			REL::Relocation<func_t> func{ RELOCATION_ID(51907, 52845) };
+			static REL::Relocation<func_t> func{ RELOCATION_ID(51907, 52845) };
 			return func(a_actorValue);
 		}
 
 		static void UpdateCrosshairMagicTarget(bool a_valid)
 		{
 			using func_t = decltype(&HUDMenu::UpdateCrosshairMagicTarget);
-			REL::Relocation<func_t> func{ RELOCATION_ID(50738, 51633) };
+			static REL::Relocation<func_t> func{ RELOCATION_ID(50738, 51633) };
 			return func(a_valid);
 		}
 
diff --git a/include/RE/L/LevelUpMenu.h b/include/RE/L/LevelUpMenu.h
@@ -31,6 +31,8 @@ namespace RE
 			// members
 			LevelUpMenu*   menu;        // 10
 			RE::ActorValue actorValue;  // 18
+		private:
+			KEEP_FOR_RE()
 		};
 		static_assert(sizeof(ConfirmLevelUpAttributeCallback) == 0x20);
 
diff --git a/include/RE/L/LooseFileLocation.h b/include/RE/L/LooseFileLocation.h
@@ -49,7 +49,7 @@ namespace RE
 				auto memory = malloc<LooseFileLocation>();
 				std::memset(memory, 0, sizeof(LooseFileLocation));
 
-				REL::Relocation<std::uintptr_t> vtbl{ RELOCATION_ID(232012, 188191) };
+				static REL::Relocation<std::uintptr_t> vtbl{ RELOCATION_ID(232012, 188191) };
 				((std::uintptr_t*)memory)[0] = vtbl.address();
 
 				memory->prefix = a_prefix;
diff --git a/include/RE/M/MagicItemFindFunctor.h b/include/RE/M/MagicItemFindFunctor.h
@@ -21,6 +21,8 @@ namespace RE
 		// members
 		std::int32_t  indexCount;  // 10
 		std::uint32_t pad14;       // 14
+	private:
+		KEEP_FOR_RE()
 	};
 	static_assert(sizeof(MagicItemFindFunctor) == 0x18);
 }
diff --git a/include/RE/M/MagicItemFindKeywordFunctor.h b/include/RE/M/MagicItemFindKeywordFunctor.h
@@ -19,6 +19,8 @@ namespace RE
 
 		// members
 		BGSKeyword* keyword;  // 18
+	private:
+		KEEP_FOR_RE()
 	};
 	static_assert(sizeof(MagicItemFindKeywordFunctor) == 0x20);
 }
diff --git a/include/RE/M/MagicTarget.h b/include/RE/M/MagicTarget.h
@@ -166,7 +166,7 @@ namespace RE
 		void ForEachActiveEffect(MagicTarget::ForEachActiveEffectVisitor& visitor)
 		{
 			using func_t = decltype(&MagicTarget::ForEachActiveEffect);
-			REL::Relocation<func_t> func{ REL::ID(33756) };
+			static REL::Relocation<func_t> func{ REL::ID(33756) };
 			func(this, visitor);
 		}
 #endif
diff --git a/include/RE/M/MapMenu.h b/include/RE/M/MapMenu.h
@@ -107,7 +107,7 @@ namespace RE
 		void PlaceMarker()
 		{
 			using func_t = decltype(&MapMenu::PlaceMarker);
-			REL::Relocation<func_t> func{ RELOCATION_ID(52226, 53113) };
+			static REL::Relocation<func_t> func{ RELOCATION_ID(52226, 53113) };
 			return func(this);
 		}
 
diff --git a/include/RE/N/NativeLatentFunction.h b/include/RE/N/NativeLatentFunction.h
@@ -104,7 +104,7 @@ namespace RE
 		requires is_return_convertible_v<V>
 		void IVirtualMachine::ReturnLatentResult(VMStackID a_stackID, V a_result)
 		{
-			auto var = RE::BSScript::Variable();
+			auto var = RE::BSScript::Variable::Variable();
 			var.Pack(a_result);
 			ReturnFromLatent(a_stackID, var);
 		}
diff --git a/include/RE/W/WeaponEnchantmentController.h b/include/RE/W/WeaponEnchantmentController.h
@@ -43,6 +43,8 @@ namespace RE
 		std::uint8_t          pad39;        // 39
 		std::uint16_t         pad3A;        // 3A
 		std::uint32_t         pad3C;        // 3C
+	private:
+		KEEP_FOR_RE()
 	};
 	static_assert(sizeof(WeaponEnchantmentController) == 0x40);
 }
diff --git a/src/RE/A/AIProcess.cpp b/src/RE/A/AIProcess.cpp
@@ -211,7 +211,7 @@ namespace RE
 	void AIProcess::SetActorRefraction(float a_refraction)
 	{
 		using func_t = decltype(&AIProcess::SetActorRefraction);
-		REL::Relocation<func_t> func{ REL::ID(5375528368) };
+		static REL::Relocation<func_t> func{ REL::ID(5375528368) };
 		return func(this, a_refraction);
 	}
 #endif
diff --git a/src/RE/B/BSLightingShaderProperty.cpp b/src/RE/B/BSLightingShaderProperty.cpp
@@ -59,7 +59,7 @@ namespace RE
 	void BSLightingShaderProperty::InvalidateTextures(std::uint32_t a_unk1)
 	{
 		using func_t = decltype(&BSLightingShaderProperty::InvalidateTextures);
-		REL::Relocation<func_t> func{ REL::ID(5388393136) };
+		static REL::Relocation<func_t> func{ REL::ID(5388393136) };
 		func(this, a_unk1);
 	}
 #endif
diff --git a/src/RE/B/BSOpenVR.cpp b/src/RE/B/BSOpenVR.cpp
@@ -7,42 +7,42 @@ namespace RE
 #ifdef SKYRIMVR
 	BSOpenVR* BSOpenVR::GetSingleton()
 	{
-		REL::Relocation<BSOpenVR**> singleton{ Offset::BSOpenVR::Singleton };
+		static REL::Relocation<BSOpenVR**> singleton{ Offset::BSOpenVR::Singleton };
 		return *singleton;
 	}
 
 	vr::IVRCompositor* BSOpenVR::GetIVRCompositor()
 	{
 		using func_t = decltype(&BSOpenVR::GetIVRCompositor);
-		REL::Relocation<func_t> func{ REL::Offset(0xC57880) };
+		static REL::Relocation<func_t> func{ REL::Offset(0xC57880) };
 		return func();
 	}
 
 	vr::IVROverlay* BSOpenVR::GetIVROverlay(Unk190* a_unk190)
 	{
 		using func_t = decltype(&BSOpenVR::GetIVROverlay);
-		REL::Relocation<func_t> func{ REL::Offset(0x8A0110) };
+		static REL::Relocation<func_t> func{ REL::Offset(0x8A0110) };
 		return func(a_unk190);
 	}
 
 	vr::IVRRenderModels* BSOpenVR::GetIVRRenderModels()
 	{
 		using func_t = decltype(&BSOpenVR::GetIVRRenderModels);
-		REL::Relocation<func_t> func{ REL::Offset(0xC57920) };
+		static REL::Relocation<func_t> func{ REL::Offset(0xC57920) };
 		return func();
 	}
 
 	vr::IVRSettings* BSOpenVR::GetIVRSettings()
 	{
 		using func_t = decltype(&BSOpenVR::GetIVRSettings);
-		REL::Relocation<func_t> func{ REL::Offset(0xC579C0) };
+		static REL::Relocation<func_t> func{ REL::Offset(0xC579C0) };
 		return func();
 	}
 
 	vr::IVRSystem* BSOpenVR::GetIVRSystem()
 	{
 		using func_t = decltype(&BSOpenVR::GetIVRSystem);
-		REL::Relocation<func_t> func{ REL::Offset(0xC57A60) };
+		static REL::Relocation<func_t> func{ REL::Offset(0xC57A60) };
 		return func();
 	}
 #endif
diff --git a/src/RE/B/BSShaderProperty.cpp b/src/RE/B/BSShaderProperty.cpp
@@ -6,7 +6,7 @@ namespace RE
 	bool BSShaderProperty::InvalidateMaterial()
 	{
 		using func_t = decltype(&BSShaderProperty::InvalidateMaterial);
-		REL::Relocation<func_t> func{ REL::ID(5370397616) };
+		static REL::Relocation<func_t> func{ REL::ID(5370397616) };
 		return func(this);
 	}
 #endif
diff --git a/src/RE/I/IMenu.cpp b/src/RE/I/IMenu.cpp
@@ -100,7 +100,7 @@ namespace RE
 	void IMenu::Unk_0A()
 	{
 		using func_t = decltype(&IMenu::Unk_0A);
-		REL::Relocation<func_t> func{ REL::Offset(0xF2A8B0) };
+		static REL::Relocation<func_t> func{ REL::Offset(0xF2A8B0) };
 		return func(this);
 	}
 #endif
diff --git a/src/RE/I/InventoryChanges.cpp b/src/RE/I/InventoryChanges.cpp
@@ -33,14 +33,14 @@ namespace RE
 	void InventoryChanges::GenerateLeveledListChanges()
 	{
 		using func_t = decltype(&InventoryChanges::GenerateLeveledListChanges);
-		REL::Relocation<func_t> func{ REL::ID(5370677424) };
+		static REL::Relocation<func_t> func{ REL::ID(5370677424) };
 		return func(this);
 	}
 
 	std::int16_t InventoryChanges::GetItemCount(RE::TESBoundObject* a_obj)
 	{
 		using func_t = decltype(&InventoryChanges::GetItemCount);
-		REL::Relocation<func_t> func{ REL::ID(5370704656) };
+		static REL::Relocation<func_t> func{ REL::ID(5370704656) };
 		return func(this, a_obj);
 	}
 #endif
diff --git a/src/RE/P/PlayerCharacter.cpp b/src/RE/P/PlayerCharacter.cpp
@@ -33,7 +33,7 @@ namespace RE
 	void PlayerCharacter::ActivatePickRef(VR_DEVICE a_device)
 	{
 		using func_t = decltype(&PlayerCharacter::ActivatePickRef);
-		REL::Relocation<func_t> func{ RELOCATION_ID(39471, 40548) };
+		static REL::Relocation<func_t> func{ RELOCATION_ID(39471, 40548) };
 		return func(this, a_device);
 	}
 #endif
@@ -224,7 +224,7 @@ namespace RE
 	void PlayerCharacter::StartGrabObject(VR_DEVICE a_device)
 	{
 		using func_t = decltype(&PlayerCharacter::StartGrabObject);
-		REL::Relocation<func_t> func{ RELOCATION_ID(39475, 40552) };
+		static REL::Relocation<func_t> func{ RELOCATION_ID(39475, 40552) };
 		return func(this, a_device);
 	}
 #endif
diff --git a/src/RE/U/UI.cpp b/src/RE/U/UI.cpp
@@ -86,7 +86,7 @@ namespace RE
 	void UI::GetTopMostMenu(RE::IMenu** a_result, std::uint32_t a_depthLimit)
 	{
 		using func_t = decltype(&UI::GetTopMostMenu);
-		REL::Relocation<func_t> func{ RELOCATION_ID(79944, 82081) };
+		static REL::Relocation<func_t> func{ RELOCATION_ID(79944, 82081) };
 		return func(this, a_result, a_depthLimit);
 	}
 }
diff --git a/src/RE/W/WorldSpaceMenu.cpp b/src/RE/W/WorldSpaceMenu.cpp

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ namespace RE`
`143`	`143`	`static EntryPoint* GetEntryPoint(ENTRY_POINT a_entryPoint)`
`144`	`144`	`{`
`145`	`145`	`if (a_entryPoint < ENTRY_POINT::kTotal) {`
`146`		`- REL::Relocation<EntryPoint*> entryPoints{ RELOCATION_ID(675707, 368994) }; //TODO: Verify SSE ID against VR`
	`146`	`+ static REL::Relocation<EntryPoint*> entryPoints{ RELOCATION_ID(675707, 368994) }; //TODO: Verify SSE ID against VR`
`147`	`147`	`return &entryPoints.get()[a_entryPoint];`
`148`	`148`	`}`
`149`	`149`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ namespace RE`
`65`	`65`	`static std::uint32_t GetArgumentCount(ENTRY_POINT_FUNCTION_TYPE a_entryPointFunctionType)`
`66`	`66`	`{`
`67`	`67`	`if (a_entryPointFunctionType < ENTRY_POINT_FUNCTION_TYPE::kTotal) {`
`68`		`- REL::Relocation<std::uint32_t*> entryPointFunctionTypeArgumentCount{ REL::ID(369210) };`
	`68`	`+ static REL::Relocation<std::uint32_t*> entryPointFunctionTypeArgumentCount{ REL::ID(369210) };`
`69`	`69`	`return entryPointFunctionTypeArgumentCount.get()[a_entryPointFunctionType];`
`70`	`70`	`}`
`71`	`71`
`@@ -75,7 +75,7 @@ namespace RE`
`75`	`75`	`static EntryPointFunction* GetEntryPointFunction(ENTRY_POINT_FUNCTION a_entryPointFunction)`
`76`	`76`	`{`
`77`	`77`	`if (a_entryPointFunction < ENTRY_POINT_FUNCTION::kTotal) {`
`78`		`- REL::Relocation<EntryPointFunction*> entryPointFunctions{ REL::ID(369178) };`
	`78`	`+ static REL::Relocation<EntryPointFunction*> entryPointFunctions{ REL::ID(369178) };`
`79`	`79`	`return &entryPointFunctions.get()[a_entryPointFunction];`
`80`	`80`	`}`
`81`	`81`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@ namespace RE`
`21`	`21`	`uint32_t unkBC; // BC`
`22`	`22`	`uint32_t unkC0; // C0`
`23`	`23`	`uint16_t unkC4; // C4`
	`24`	`+ private:`
	`25`	`+ KEEP_FOR_RE()`
`24`	`26`	`};`
`25`	`27`	`static_assert(sizeof(BSCompoundFrustum) == 0xC8);`
`26`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,8 @@ namespace RE`
`46`	`46`	`uint64_t unk1D0; // 1D0`
`47`	`47`	`uint64_t unk1D8; // 1D8`
`48`	`48`	`uint64_t unk1E0; // 1E0`
	`49`	`+ private:`
	`50`	`+ KEEP_FOR_RE()`
`49`	`51`	`};`
`50`	`52`	`static_assert(sizeof(BSOcclusionBox) == 0x1E8);`
`51`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@ namespace RE`
`24`	`24`	`// members`
`25`	`25`	`NiPoint2 size; // 48`
`26`	`26`	`BSCompoundFrustum frustum; // 50`
	`27`	`+ private:`
	`28`	`+ KEEP_FOR_RE()`
`27`	`29`	`};`
`28`	`30`	`static_assert(sizeof(BSOcclusionPlane) == 0x118);`
`29`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,8 @@ namespace RE`
`28`	`28`	`NiMatrix3 rotation; // 1C`
`29`	`29`	`float unk40; // 40`
`30`	`30`	`bool unk44; // 44`
	`31`	`+ private:`
	`32`	`+ KEEP_FOR_RE()`
`31`	`33`	`};`
`32`	`34`	`static_assert(sizeof(BSOcclusionShape) == 0x48);`
`33`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,8 @@ namespace RE`
`30`	`30`	`NiPoint3 lightPosition; // 30218`
`31`	`31`	`float lightRadius; // 30224`
`32`	`32`	`NiPointer<NiCamera> lightCamera; // 30228`
	`33`	`+ private:`
	`34`	`+ KEEP_FOR_RE()`
`33`	`35`	`};`
`34`	`36`	`static_assert(sizeof(BSParabolicCullingProcess) == 0x30230);`
`35`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,8 @@ namespace RE`
`27`	`27`	`BSCompoundFrustum compoundFrustum; // 68`
`28`	`28`	`uint64_t unk130; // 130`
`29`	`29`	`uint32_t cellId; // 138`
	`30`	`+ private:`
	`31`	`+ KEEP_FOR_RE()`
`30`	`32`	`};`
`31`	`33`	`static_assert(sizeof(BSPortalGraphEntry) == 0x140);`
`32`	`34`	`}`