feat: Add IsSpaceshipDocked and fix excessive namespace for TESWorlds…

…pace (#93) address is of 1.7.29
Starfield-Reverse-Engineering · Sep 25, 2023 · 1ef1170 · 1ef1170
1 parent 9bd7e4e
commit 1ef1170
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/CommonLibSF/include/RE/T/TESObjectREFR.h b/CommonLibSF/include/RE/T/TESObjectREFR.h
@@ -299,6 +299,7 @@ namespace RE
 		[[nodiscard]] bool                  HasKeyword(BGSKeyword* a_keyword);
 		[[nodiscard]] bool                  IsCrimeToActivate();
 		[[nodiscard]] bool                  IsInSpace(bool a_arg1);
+		[[nodiscard]] bool                  IsSpaceshipDocked();
 
 		// members
 		std::uint32_t  unk80;          // 80

diff --git a/CommonLibSF/include/RE/T/TESWorldSpace.h b/CommonLibSF/include/RE/T/TESWorldSpace.h
@@ -6,8 +6,8 @@
 namespace RE
 {
 	class TESWorldSpace :
-		public RE::TESForm,     // 00
-		public RE::TESFullName  // 20
+		public TESForm,     // 00
+		public TESFullName  // 20
 	{
 	public:
 		SF_FORMTYPE(WRLD);

diff --git a/CommonLibSF/src/RE/T/TESObjectREFR.cpp b/CommonLibSF/src/RE/T/TESObjectREFR.cpp
@@ -71,4 +71,12 @@ namespace RE
 		REL::Relocation<func_t> func{ REL::Offset(0x01A0E1C8) };
 		return func(this, a_arg1);
 	}
+
+	bool TESObjectREFR::IsSpaceshipDocked()
+	{
+		using func_t = decltype(&TESObjectREFR::IsSpaceshipDocked);
+		REL::Relocation<func_t> func{ REL::Offset(0x2B557C8) };
+		return func(this);
+	}
+
 }