fix: add missing files

Starfield-Reverse-Engineering · Nov 22, 2023 · 326e9c9 · 326e9c9
1 parent 0f2fef9
commit 326e9c9
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 28 deletions.
diff --git a/CommonLibSF/include/RE/B/BGSLevGenericBaseForm.h b/CommonLibSF/include/RE/B/BGSLevGenericBaseForm.h
@@ -18,5 +18,5 @@ namespace RE
 
 		~BGSLevGenericBaseForm() override;  // 00
 	};
-	static_assert(sizeof(BGSLevGenericBaseForm) == 0x1A0);
+	static_assert(sizeof(BGSLevGenericBaseForm) == 0x168);
 }
diff --git a/CommonLibSF/include/RE/T/TESClass.h b/CommonLibSF/include/RE/T/TESClass.h
@@ -19,10 +19,10 @@ namespace RE
 
 	class TESClass :
 		public TESForm,          // 00
-		public TESFullName,      // 38
-		public TESDescription,   // 48
-		public TESTexture,       // 60
-		public BGSPropertySheet  // 70
+		public TESFullName,      // 30
+		public TESDescription,   // 38
+		public TESTexture,       // 58
+		public BGSPropertySheet  // 68
 	{
 	public:
 		SF_RTTI_VTABLE(TESClass);
@@ -31,7 +31,7 @@ namespace RE
 		~TESClass() override;  // 00
 
 		// members
-		CLASS_DATA data;  // 78 - DATA
+		CLASS_DATA data;  // 70 - DATA
 	};
-	static_assert(sizeof(TESClass) == 0x88);
+	static_assert(sizeof(TESClass) == 0x80);
 }
diff --git a/CommonLibSF/include/RE/T/TESContainer.h b/CommonLibSF/include/RE/T/TESContainer.h
@@ -29,6 +29,13 @@ namespace RE
 		const BSFixedString& GetFormComponentType() const override;  // 01 - { return "TESContainer_Component"; }
 		void                 InitializeDataComponent() override;     // 02 - { return; }
 
+		void AddObjectToContainer(TESForm* a_owner, TESBoundObject* a_obj, std::int32_t a_count, ContainerItemExtra* a_itemExtra)
+		{
+			using func_t = decltype(&TESContainer::AddObjectToContainer);
+			REL::Relocation<func_t> func{ REL::ID(85991) };
+			return func(this, a_owner, a_obj, a_count, a_itemExtra);
+		}
+
 		// members
 		BSTArray<ContainerObject> containerObjects;  // 08
 	};

diff --git a/CommonLibSF/include/RE/T/TESObjectARMA.h b/CommonLibSF/include/RE/T/TESObjectARMA.h
@@ -31,9 +31,8 @@ namespace RE
 
 	class TESObjectARMA :
 		public TESObject,                 // 00
-		public BGSSnapTemplateComponent,  // 38
-		public TESRaceForm,               // 50
-		public BGSBipedObjectForm         // 60
+		public TESRaceForm,               // 48
+		public BGSBipedObjectForm         // 58
 	{
 	public:
 		SF_RTTI_VTABLE(TESObjectARMA);
@@ -42,24 +41,24 @@ namespace RE
 		~TESObjectARMA() override;  // 00
 
 		// members
-		BGSEditorID          formEditorID;                         // 070
-		OBJ_ARMA             data;                                 // 080
-		BGSModelMaterialSwap bipedModel[SEXES::kTotal];            // 090
-		BGSModelMaterialSwap bipedModelFacebones[SEXES::kTotal];   // 0E0
-		BGSModelMaterialSwap unk130[SEXES::kTotal];                // 130
-		TESModel             unk180[SEXES::kTotal];                // 180
-		BGSMorphableObject*  unk1C0[SEXES::kTotal];                // 1C0
-		BGSMorphableObject*  unk1D0[SEXES::kTotal];                // 1D0
-		BGSTextureSet*       skinTextures[SEXES::kTotal];          // 1E0
-		BGSListForm*         skinTextureSwapLists[SEXES::kTotal];  // 1F0
-		BSTArray<void*>      unk200[SEXES::kTotal];                // 200
+		BGSEditorID          formEditorID;                         // 068
+		OBJ_ARMA             data;                                 // 078
+		BGSModelMaterialSwap bipedModel[SEXES::kTotal];            // 088
+		BGSModelMaterialSwap bipedModelFacebones[SEXES::kTotal];   // 0D8
+		BGSModelMaterialSwap unk128[SEXES::kTotal];                // 128
+		TESModel             unk178[SEXES::kTotal];                // 178
+		BGSMorphableObject*  unk1B8[SEXES::kTotal];                // 1B8
+		BGSMorphableObject*  unk1C8[SEXES::kTotal];                // 1C8
+		BGSTextureSet*       skinTextures[SEXES::kTotal];          // 1D8
+		BGSListForm*         skinTextureSwapLists[SEXES::kTotal];  // 1E8
+		BSTArray<void*>      unk1F8[SEXES::kTotal];                // 1F8
+		std::uint64_t        unk218;                               // 218
 		std::uint64_t        unk220;                               // 220
-		std::uint64_t        unk228;                               // 228
-		BSTArray<TESRace*>   additionalRaces;                      // 230
-		BGSBodyPartData*     bodyPartData;                         // 240
-		BGSFootstepSet*      footstepSet;                          // 248
-		BGSArtObject*        artObject;                            // 250
-		AVMData              avmData;                              // 258
+		BSTArray<TESRace*>   additionalRaces;                      // 228
+		BGSBodyPartData*     bodyPartData;                         // 238
+		BGSFootstepSet*      footstepSet;                          // 240
+		BGSArtObject*        artObject;                            // 248
+		AVMData              avmData;                              // 250
 	};
-	static_assert(sizeof(TESObjectARMA) == 0x280);
+	static_assert(sizeof(TESObjectARMA) == 0x278);
 }