Merge pull request #24 from qudix/dev

feat: misc

Author: shad0wshayd3

CommonLibF4/include/RE/Bethesda/IMenu.h

@@ -400,7 +400,7 @@ namespace RE
 		bool                                                     menuCanBeVisible{ true };                             // 61
 		bool                                                     hasQuadsForCumstomRenderer{ false };                  // 62
 		bool                                                     hasDoneFirstAdvanceMovie{ false };                    // 63
-		REX::EnumSet<UI_DEPTH_PRIORITY, std::uint8_t>            depthPriority{ UI_DEPTH_PRIORITY::kStandard };        // 64
+		UI_DEPTH_PRIORITY                                        depthPriority{ UI_DEPTH_PRIORITY::kStandard };        // 64
 		REX::EnumSet<UserEvents::INPUT_CONTEXT_ID, std::int32_t> inputContext{ UserEvents::INPUT_CONTEXT_ID::kNone };  // 68
 	};
 	static_assert(sizeof(IMenu) == 0x70);

CommonLibF4/include/RE/Bethesda/PlayerControls.h

@@ -22,7 +22,6 @@ namespace RE
 	struct AutoMoveHandler;
 	struct GrabRotationHandler;
 	struct JumpHandler;
-	struct LookHandler;
 	struct MeleeThrowHandler;
 	struct MovementHandler;
 	struct ReadyWeaponHandler;
@@ -138,6 +137,22 @@ namespace RE
 	};
 	static_assert(sizeof(HeldStateHandler) == 0x28);
 
+	class LookHandler :
+		public PlayerInputHandler
+	{
+	public:
+		static constexpr auto RTTI{ RTTI::LookHandler };
+		static constexpr auto VTABLE{ VTABLE::LookHandler };
+
+		explicit constexpr LookHandler(PlayerControlsData& a_data) noexcept :
+			PlayerInputHandler(a_data)
+		{}
+
+		// members
+		float thumbstickMaxedSec{ 0.0f };  // 20
+	};
+	static_assert(sizeof(LookHandler) == 0x28);
+
 	class __declspec(novtable) PlayerControls :
 		BSInputEventReceiver,                    // 000
 		BSTEventSink<MenuOpenCloseEvent>,        // 010
@@ -154,7 +169,7 @@ namespace RE
 
 		static PlayerControls* GetSingleton()
 		{
-			static REL::Relocation<PlayerControls**> singleton{ REL::ID(544871) };
+			static REL::Relocation<PlayerControls**> singleton{ REL::ID(2692013) };
 			return *singleton;
 		}
 

CommonLibF4/include/REL/IDDB.h

@@ -24,26 +24,7 @@ namespace REL
 			return singleton;
 		}
 
-		[[nodiscard]] std::size_t id2offset(std::uint64_t a_id) const
-		{
-			if (_id2offset.empty()) {
-				stl::report_and_fail("data is empty"sv);
-			}
-
-			const mapping_t elem{ a_id, 0 };
-			const auto      it = std::lower_bound(
-					 _id2offset.begin(),
-					 _id2offset.end(),
-					 elem,
-					 [](auto&& a_lhs, auto&& a_rhs) {
-                    return a_lhs.id < a_rhs.id;
-                });
-			if (it == _id2offset.end()) {
-				stl::report_and_fail("id not found"sv);
-			}
-
-			return static_cast<std::size_t>(it->offset);
-		}
+		[[nodiscard]] std::size_t id2offset(std::uint64_t a_id) const;
 
 	protected:
 		friend class Offset2ID;

CommonLibF4/src/REL/IDDB.cpp

@@ -1,4 +1,5 @@
 #include "REL/IDDB.h"
+#include "REL/Module.h"
 #include "REL/Version.h"
 
 #include "REX/W32/BCRYPT.h"
@@ -105,4 +106,27 @@ namespace REL
 			*reinterpret_cast<const std::uint64_t*>(_mmap.data())
 		};
 	}
+
+	std::size_t IDDB::id2offset(std::uint64_t a_id) const
+	{
+		if (_id2offset.empty()) {
+			stl::report_and_fail("data is empty"sv);
+		}
+
+		const mapping_t elem{ a_id, 0 };
+		const auto      it = std::lower_bound(
+            _id2offset.begin(),
+            _id2offset.end(),
+            elem,
+            [](auto&& a_lhs, auto&& a_rhs) {
+                return a_lhs.id < a_rhs.id;
+            });
+		if (it == _id2offset.end()) {
+			const auto version = Module::get().version();
+			const auto str = std::format("id {} not found!\ngame version: {}"sv, a_id, version.string());
+			stl::report_and_fail(str);
+		}
+
+		return static_cast<std::size_t>(it->offset);
+	}
 }