Merge pull request #27 from Nightfallstorm/vr

Few RE changes
alandtse · Dec 8, 2023 · ffbfa96 · ffbfa96
2 parents 06182ef + 146a125
commit ffbfa96
Show file tree

Hide file tree

Showing 27 changed files with 159 additions and 10 deletions.
diff --git a/cmake/sourcelist.cmake b/cmake/sourcelist.cmake
@@ -1588,6 +1588,7 @@ set(SOURCES
 	include/RE/T/TargetValueModifierEffect.h
 	include/RE/T/TaskQueueInterface.h
 	include/RE/T/TelekinesisEffect.h
+	include/RE/T/TeleportHandler.h
 	include/RE/T/TempEffectTraits.h
 	include/RE/T/TextureAddressModes.h
 	include/RE/T/TextureFileFormat.h

diff --git a/include/RE/A/ActivateHandler.h b/include/RE/A/ActivateHandler.h
@@ -26,5 +26,9 @@ namespace RE
 	private:
 		KEEP_FOR_RE()
 	};
+#ifndef SKYRIMVR
 	static_assert(sizeof(ActivateHandler) == 0x20);
+#else
+	static_assert(sizeof(ActivateHandler) == 0x38);
+#endif
 }
diff --git a/include/RE/A/AttackBlockHandler.h b/include/RE/A/AttackBlockHandler.h
@@ -43,5 +43,9 @@ namespace RE
 	private:
 		KEEP_FOR_RE()
 	};
+#ifndef SKYRIMVR
 	static_assert(sizeof(AttackBlockHandler) == 0x48);
+#else
+	static_assert(sizeof(AttackBlockHandler) == 0x60);
+#endif
 }
diff --git a/include/RE/A/AutoMoveHandler.h b/include/RE/A/AutoMoveHandler.h
@@ -17,5 +17,9 @@ namespace RE
 	private:
 		KEEP_FOR_RE()
 	};
+#ifndef SKYRIMVR
 	static_assert(sizeof(AutoMoveHandler) == 0x10);
+#else
+	static_assert(sizeof(AutoMoveHandler) == 0x28);
+#endif
 }
diff --git a/include/RE/B/BGSSaveLoadGame.h b/include/RE/B/BGSSaveLoadGame.h
@@ -80,9 +80,14 @@ namespace RE
 			return *singleton;
 		}
 
-		// members
-		BSTArray<TESFile*>                     pluginList;           // 000
-		BSTArray<void*>                        unk18;                // 018
+// members
+#ifndef SKYRIMVR
+		BSTArray<TESFile*> pluginList;  // 000
+		BSTArray<void*>    unk18;       // 018
+#else
+		std::uint8_t pluginList[0xFF];  // 000
+		std::uint8_t unk18[0xFF];       // 0FF
+#endif
 		BGSSaveLoadFormIDMap                   worldspaceFormIDMap;  // 030
 		BSTHashMap<FormID, ActorHandle>        unk98;                // 098
 		BGSSaveLoadReferencesMap               unkC8;                // 0C8
@@ -99,5 +104,9 @@ namespace RE
 	private:
 		KEEP_FOR_RE()
 	};
+#ifndef SKYRIMVR
 	static_assert(sizeof(BGSSaveLoadGame) == 0x348);
+#else
+	static_assert(sizeof(BGSSaveLoadGame) == 0x518);
+#endif
 }
diff --git a/include/RE/B/BleedoutCameraState.h b/include/RE/B/BleedoutCameraState.h
@@ -37,5 +37,9 @@ namespace RE
 	private:
 		KEEP_FOR_RE()
 	};
+#ifndef SKYRIMVR
 	static_assert(sizeof(BleedoutCameraState) == 0x138);
+#else
+	static_assert(sizeof(BleedoutCameraState) == 0x150);
+#endif
 }
diff --git a/include/RE/F/FirstPersonState.h b/include/RE/F/FirstPersonState.h
@@ -53,5 +53,9 @@ namespace RE
 	private:
 		KEEP_FOR_RE()
 	};
+#ifndef SKYRIMVR
 	static_assert(sizeof(FirstPersonState) == 0x90);
+#else
+	static_assert(sizeof(FirstPersonState) == 0xA8);
+#endif
 }
diff --git a/include/RE/F/FreeCameraState.h b/include/RE/F/FreeCameraState.h
@@ -40,5 +40,9 @@ namespace RE
 	private:
 		KEEP_FOR_RE()
 	};
+#ifndef SKYRIMVR
 	static_assert(sizeof(FreeCameraState) == 0x50);
+#else
+	static_assert(sizeof(FreeCameraState) == 0x68);
+#endif
 }
diff --git a/include/RE/H/HeldStateHandler.h b/include/RE/H/HeldStateHandler.h
@@ -24,5 +24,9 @@ namespace RE
 	private:
 		KEEP_FOR_RE()
 	};
+#ifndef SKYRIMVR
 	static_assert(sizeof(HeldStateHandler) == 0x18);
+#else
+	static_assert(sizeof(HeldStateHandler) == 0x30);
+#endif
 }
diff --git a/include/RE/H/HorseCameraState.h b/include/RE/H/HorseCameraState.h
@@ -34,5 +34,9 @@ namespace RE
 	private:
 		KEEP_FOR_RE()
 	};
+#ifndef SKYRIMVR
 	static_assert(sizeof(HorseCameraState) == 0xF8);
+#else
+	static_assert(sizeof(HorseCameraState) == 0x110);
+#endif
 }
diff --git a/include/RE/J/JumpHandler.h b/include/RE/J/JumpHandler.h
@@ -18,5 +18,9 @@ namespace RE
 	private:
 		KEEP_FOR_RE()
 	};
+#ifndef SKYRIMVR
 	static_assert(sizeof(JumpHandler) == 0x10);
+#else
+	static_assert(sizeof(JumpHandler) == 0x28);
+#endif
 }
diff --git a/include/RE/L/LookHandler.h b/include/RE/L/LookHandler.h
@@ -19,5 +19,9 @@ namespace RE
 	private:
 		KEEP_FOR_RE()
 	};
+#ifndef SKYRIMVR
 	static_assert(sizeof(LookHandler) == 0x10);
+#else
+	static_assert(sizeof(LookHandler) == 0x28);
+#endif
 }
diff --git a/include/RE/M/MovementHandler.h b/include/RE/M/MovementHandler.h
@@ -18,5 +18,9 @@ namespace RE
 	private:
 		KEEP_FOR_RE()
 	};
+#ifndef SKYRIMVR
 	static_assert(sizeof(MovementHandler) == 0x10);
+#else
+	static_assert(sizeof(MovementHandler) == 0x28);
+#endif
 }
diff --git a/include/RE/P/PlayerInputHandler.h b/include/RE/P/PlayerInputHandler.h
@@ -1,4 +1,5 @@
 #pragma once
+#include "RE/B/BSFixedString.h"
 
 namespace RE
 {
@@ -20,6 +21,11 @@ namespace RE
 		virtual void ProcessMouseMove(MouseMoveEvent* a_event, PlayerControlsData* a_data);    // 03 - { return; }
 		virtual void ProcessButton(ButtonEvent* a_event, PlayerControlsData* a_data);          // 04 - { return; }
 
+#ifdef SKYRIMVR
+		virtual void Unk_05(void);  // 05
+		virtual void Unk_06(void);  // 05
+#endif
+
 		[[nodiscard]] bool IsInputEventHandlingEnabled() const;
 		void               SetInputEventHandlingEnabled(bool a_enabled);
 
@@ -28,8 +34,17 @@ namespace RE
 		std::uint8_t  pad09;                      // 09
 		std::uint16_t pad0A;                      // 0A
 		std::uint32_t pad0C;                      // 0C
+#ifdef SKYRIMVR
+		std::uint64_t unk10;  // 10
+		BSFixedString unk18;  // 18
+		std::uint64_t unk20;
+#endif
 	private:
 		KEEP_FOR_RE()
 	};
+#ifndef SKYRIMVR
 	static_assert(sizeof(PlayerInputHandler) == 0x10);
+#else
+	static_assert(sizeof(PlayerInputHandler) == 0x28);
+#endif
 }
diff --git a/include/RE/R/ReadyWeaponHandler.h b/include/RE/R/ReadyWeaponHandler.h
@@ -17,5 +17,9 @@ namespace RE
 	private:
 		KEEP_FOR_RE()
 	};
+#ifndef SKYRIMVR
 	static_assert(sizeof(ReadyWeaponHandler) == 0x10);
+#else
+	static_assert(sizeof(ReadyWeaponHandler) == 0x28);
+#endif
 }
diff --git a/include/RE/R/RunHandler.h b/include/RE/R/RunHandler.h
@@ -17,5 +17,9 @@ namespace RE
 	private:
 		KEEP_FOR_RE()
 	};
+#ifndef SKYRIMVR
 	static_assert(sizeof(RunHandler) == 0x18);
+#else
+	static_assert(sizeof(RunHandler) == 0x30);
+#endif
 }
diff --git a/include/RE/S/ShoutHandler.h b/include/RE/S/ShoutHandler.h
@@ -21,5 +21,9 @@ namespace RE
 	private:
 		KEEP_FOR_RE()
 	};
+#ifndef SKYRIMVR
 	static_assert(sizeof(ShoutHandler) == 0x20);
+#else
+	static_assert(sizeof(ShoutHandler) == 0x38);
+#endif
 }
diff --git a/include/RE/S/SneakHandler.h b/include/RE/S/SneakHandler.h
@@ -17,5 +17,9 @@ namespace RE
 	private:
 		KEEP_FOR_RE()
 	};
+#ifndef SKYRIMVR
 	static_assert(sizeof(SneakHandler) == 0x10);
+#else
+	static_assert(sizeof(SneakHandler) == 0x28);
+#endif
 }
diff --git a/include/RE/S/SprintHandler.h b/include/RE/S/SprintHandler.h
@@ -17,5 +17,9 @@ namespace RE
 	private:
 		KEEP_FOR_RE()
 	};
+#ifndef SKYRIMVR
 	static_assert(sizeof(SprintHandler) == 0x18);
+#else
+	static_assert(sizeof(SprintHandler) == 0x30);
+#endif
 }
diff --git a/include/RE/Skyrim.h b/include/RE/Skyrim.h
@@ -1579,6 +1579,7 @@
 #include "RE/T/TargetValueModifierEffect.h"
 #include "RE/T/TaskQueueInterface.h"
 #include "RE/T/TelekinesisEffect.h"
+#include "RE/T/TeleportHandler.h"
 #include "RE/T/TempEffectTraits.h"
 #include "RE/T/TextureAddressModes.h"
 #include "RE/T/TextureFileFormat.h"

diff --git a/include/RE/T/TeleportHandler.h b/include/RE/T/TeleportHandler.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include "RE/H/HeldStateHandler.h"
+
+#ifdef SKYRIMVR
+namespace RE
+{
+	struct TeleportHandler : public HeldStateHandler
+	{
+	public:
+		inline static constexpr auto RTTI = RTTI_TeleportHandler;
+
+		~TeleportHandler() override;  // 00
+
+		// override (PlayerInputHandler)
+		bool CanProcess(InputEvent* a_event) override;                                  // 01
+		void ProcessButton(ButtonEvent* a_event, PlayerControlsData* a_data) override;  // 04
+
+		// members
+		std::uint64_t unk_30;  // 30
+		std::uint64_t unk_38;  // 38
+		std::uint64_t unk_40;  // 40
+		std::uint64_t unk_48;  // 48
+		std::uint64_t unk_50;  // 50
+		std::uint64_t unk_58;  // 58
+		std::uint64_t unk_60;  // 60
+		std::uint64_t unk_68;  // 68
+	private:
+		KEEP_FOR_RE()
+	};
+	static_assert(sizeof(TeleportHandler) == 0x70);
+
+}
+#endif
diff --git a/include/RE/T/ThirdPersonState.h b/include/RE/T/ThirdPersonState.h
@@ -77,5 +77,9 @@ namespace RE
 	private:
 		KEEP_FOR_RE()
 	};
+#ifndef SKYRIMVR
 	static_assert(sizeof(ThirdPersonState) == 0xE8);
+#else
+	static_assert(sizeof(ThirdPersonState) == 0x100);
+#endif
 }
diff --git a/include/RE/T/ThumbstickEvent.h b/include/RE/T/ThumbstickEvent.h
@@ -38,8 +38,13 @@ namespace RE
 			userEvent = a_userEvent;
 		}
 
+#ifndef SKYRIMVR
 		[[nodiscard]] bool IsLeft() const;
 		[[nodiscard]] bool IsRight() const;
+#else
+		[[nodiscard]] bool IsOffHand() const;
+		[[nodiscard]] bool IsMainHand() const;
+#endif
 
 		// members
 		float xValue;  // 28

diff --git a/include/RE/T/TogglePOVHandler.h b/include/RE/T/TogglePOVHandler.h
@@ -23,5 +23,9 @@ namespace RE
 	private:
 		KEEP_FOR_RE()
 	};
+#ifndef SKYRIMVR
 	static_assert(sizeof(TogglePOVHandler) == 0x20);
+#else
+	static_assert(sizeof(TogglePOVHandler) == 0x38);
+#endif
 }
diff --git a/include/RE/T/ToggleRunHandler.h b/include/RE/T/ToggleRunHandler.h
@@ -17,5 +17,9 @@ namespace RE
 	private:
 		KEEP_FOR_RE()
 	};
+#ifndef SKYRIMVR
 	static_assert(sizeof(ToggleRunHandler) == 0x10);
+#else
+	static_assert(sizeof(ToggleRunHandler) == 0x28);
+#endif
 }
diff --git a/src/RE/M/MagicTarget.cpp b/src/RE/M/MagicTarget.cpp
@@ -15,18 +15,14 @@ namespace RE
 
 	void MagicTarget::DispelEffectsWithArchetype(Archetype a_type, bool a_force)
 	{
-		const auto effects = GetActiveEffectList();
-		if (!effects) {
-			return;
-		}
-
 		std::vector<RE::ActiveEffect*> queued;
-		for (const auto& effect : *effects) {
+		VisitActiveEffects([&](ActiveEffect* effect) {
 			const auto setting = effect ? effect->GetBaseObject() : nullptr;
 			if (setting && setting->HasArchetype(a_type)) {
 				queued.push_back(effect);
 			}
-		}
+			return BSContainer::ForEachResult::kContinue;
+		});
 
 		for (const auto& effect : queued) {
 			effect->Dispel(a_force);

diff --git a/src/RE/T/ThumbstickEvent.cpp b/src/RE/T/ThumbstickEvent.cpp
@@ -2,6 +2,7 @@
 
 namespace RE
 {
+#ifndef SKYRIMVR
 	bool ThumbstickEvent::IsLeft(void) const
 	{
 		return idCode == InputType::kLeftThumbstick;
@@ -11,4 +12,15 @@ namespace RE
 	{
 		return idCode == InputType::kRightThumbstick;
 	}
+#else
+	bool ThumbstickEvent::IsOffHand(void) const
+	{
+		return idCode == InputType::kLeftThumbstick;
+	}
+
+	bool ThumbstickEvent::IsMainHand(void) const
+	{
+		return idCode == InputType::kRightThumbstick;
+	}
+#endif
 }