Merge branch 'vr' of github.com:alandtse/CommonLibVR into vr

alandtse · Aug 19, 2024 · d610539 · d610539
2 parents 64d394d + 1fe0613
commit d610539
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 27 deletions.
diff --git a/include/RE/C/CalibrationOptionMenu.h b/include/RE/C/CalibrationOptionMenu.h
@@ -1,7 +1,7 @@
 #pragma once
 #ifdef SKYRIMVR
-#include "RE/I/IMenu.h"
-#include "RE/M/MenuEventHandler.h"
+#	include "RE/I/IMenu.h"
+#	include "RE/M/MenuEventHandler.h"
 
 namespace RE
 {

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) == 0x120);
+	//static_assert(sizeof(ControlMap) == 0x120);
 #	else
 	static_assert(sizeof(ControlMap) == 0x128);
 #	endif

diff --git a/include/RE/H/HUDMenu.h b/include/RE/H/HUDMenu.h
@@ -78,7 +78,7 @@ namespace RE
 	{
 	public:
 		inline static constexpr auto      RTTI = RTTI_HUDMenu;
-		constexpr static std::string_view MENU_NAME = "VR/VR_HMD_info";
+		constexpr static std::string_view MENU_NAME = "HUD Menu";
 
 		~HUDMenu() override;  // 00
 

diff --git a/src/RE/M/MagicTarget.cpp b/src/RE/M/MagicTarget.cpp
@@ -45,28 +45,28 @@ namespace RE
 
 	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)

diff --git a/src/RE/T/TESDataHandler.cpp b/src/RE/T/TESDataHandler.cpp
@@ -5,10 +5,10 @@
 
 namespace RE
 {
-	TESDataHandler* TESDataHandler::GetSingleton(bool 
-	#ifdef SKYRIMVR
-		a_VRESL
-	#endif
+	TESDataHandler* TESDataHandler::GetSingleton(bool
+#ifdef SKYRIMVR
+			a_VRESL
+#endif
 	)
 	{
 		REL::Relocation<TESDataHandler**> singleton{ RELOCATION_ID(514141, 400269) };

diff --git a/src/RE/W/WorldSpaceMenu.cpp b/src/RE/W/WorldSpaceMenu.cpp
@@ -1,8 +1,8 @@
 #ifdef SKYRIMVR
-#include "RE/W/WorldSpaceMenu.h"
-#include "RE/I/InterfaceStrings.h"
-#include "RE/U/UI.h"
-#include "RE/U/UIMessage.h"
+#	include "RE/W/WorldSpaceMenu.h"
+#	include "RE/I/InterfaceStrings.h"
+#	include "RE/U/UI.h"
+#	include "RE/U/UIMessage.h"
 
 namespace RE
 {