Skip to content

Commit

Permalink
Merge branch 'main' into const
Browse files Browse the repository at this point in the history
  • Loading branch information
ThirdEyeSqueegee authored Oct 1, 2023
2 parents 6f4d837 + e268876 commit d35ddec
Show file tree
Hide file tree
Showing 223 changed files with 2,754 additions and 381 deletions.
2 changes: 1 addition & 1 deletion CommonLibSF/.clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ ContinuationIndentWidth: 4
Cpp11BracedListStyle: false
DerivePointerAlignment: false
DisableFormat: false
FixNamespaceComments: true
FixNamespaceComments: false
IncludeBlocks: Preserve
IndentCaseBlocks: true
IndentCaseLabels: false
Expand Down
44 changes: 44 additions & 0 deletions CommonLibSF/include/RE/A/AIProcess.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
#pragma once

#include "ActorPackage.h"

namespace RE
{
struct MiddleLowProcessData;
struct MiddleHighProcessData;
struct HighProcessData;

// F8
class AIProcess
{
public:
MiddleLowProcessData* middleLow; // 00
MiddleHighProcessData* middleHigh; // 08
HighProcessData* high; // 10
ActorPackage currentPackage; // 18
float hourLastProcessed; // 48
std::uint32_t unk4C; // 4C
std::uint64_t unk50; // 50
std::uint64_t unk58; // 58
std::uint64_t unk60; // 60
std::uint64_t unk68; // 68
std::uint64_t unk70; // 70
std::uint64_t unk78; // 78
std::uint64_t unk80; // 80
std::uint64_t unk88; // 88
std::uint64_t unk90; // 90
std::uint64_t unk98; // 98
std::uint64_t unkA0; // A0
std::uint64_t unkA8; // A8
std::uint64_t unkB0; // B0
std::uint64_t unkB8; // B8
std::uint64_t unkC0; // C0
std::uint64_t unkC8; // C8
std::uint64_t unkD0; // D0
std::uint64_t unkD8; // D8
std::uint64_t unkE0; // E0
std::uint64_t unkE8; // E8
std::uint64_t unkF0; // F0
};
static_assert(sizeof(AIProcess) == 0xF8);
}
254 changes: 239 additions & 15 deletions CommonLibSF/include/RE/A/Actor.h

Large diffs are not rendered by default.

24 changes: 24 additions & 0 deletions CommonLibSF/include/RE/A/ActorPackage.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#pragma once

namespace RE
{
struct ActorPackageData;
class TESPackage;

class ActorPackage
{
public:
// members
void* packageLock; // 00
TESPackage* package; // 08
ActorPackageData* data; // 10
void* target; // 18
std::int32_t currentProcedureIndex; // 1C
float packageStartTime; // 20
std::uint32_t modifiedPackageFlag; // 24
std::uint16_t modifiedInterruptFlag; // 28
std::int8_t actorPackageFlags; // 2A
std::int8_t preferredSpeed; // 2B
};
static_assert(sizeof(ActorPackage) == 0x30);
}
25 changes: 25 additions & 0 deletions CommonLibSF/include/RE/A/ActorState.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#pragma once

#include "RE/I/IMovementState.h"

namespace RE
{
class ActorState : public IMovementState
{
public:
SF_RTTI(ActorState);

~ActorState() override; // 00

// add
virtual void Unk_31(); // 31
virtual void Unk_32(); // 32
virtual void Unk_33(); // 33
virtual void Unk_34(); // 34

// members
std::uint32_t actorState1; // 08
std::uint32_t actorState2; // 0C
};
static_assert(sizeof(ActorState) == 0x10);
}
2 changes: 1 addition & 1 deletion CommonLibSF/include/RE/A/ActorValueInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@ namespace RE
std::uint32_t sortIndex; // 17C
};
static_assert(sizeof(ActorValueInfo) == 0x180);
} // namespace RE
}
2 changes: 1 addition & 1 deletion CommonLibSF/include/RE/A/ActorValueOwner.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ namespace RE
[[nodiscard]] virtual bool GetIsPlayerOwner() const; // 0B
};
static_assert(sizeof(ActorValueOwner) == 0x8);
} // namespace RE
}
2 changes: 1 addition & 1 deletion CommonLibSF/include/RE/A/ActorValues.h
Original file line number Diff line number Diff line change
Expand Up @@ -221,4 +221,4 @@ namespace RE
std::uint32_t avTypeCounts[10]; // 598
};
static_assert(sizeof(ActorValue) == 0x5C0);
} // namespace RE
}
9 changes: 7 additions & 2 deletions CommonLibSF/include/RE/B/BGSAttackDataForm.h
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
#pragma once

#include "RE/B/BaseFormComponent.h"
#include "RE/N/NiSmartPointer.h"

namespace RE
{
class BGSAttackDataMap;

class BGSAttackDataForm : public BaseFormComponent
{
public:
SF_RTTI_VTABLE(BGSAttackDataForm);

virtual ~BGSAttackDataForm(); // 00

// members
void* /*NiPointer<BGSAttackDataMap>*/ attackDataMap; // 08
NiPointer<BGSAttackDataMap> attackDataMap; // 08
};
static_assert(sizeof(BGSAttackDataForm) == 0x10);
} // namespace RE
}
2 changes: 1 addition & 1 deletion CommonLibSF/include/RE/B/BGSDestructibleObjectForm.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ namespace RE
DestructibleObjectData* data; // 08
};
static_assert(sizeof(BGSDestructibleObjectForm) == 0x10);
} // namespace RE
}
2 changes: 1 addition & 1 deletion CommonLibSF/include/RE/B/BGSEditorID.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ namespace RE
TESForm* _owner; // 08
};
static_assert(sizeof(BGSEditorID) == 0x10);
} // namespace RE
}
4 changes: 2 additions & 2 deletions CommonLibSF/include/RE/B/BGSEntryPoint.h
Original file line number Diff line number Diff line change
Expand Up @@ -270,5 +270,5 @@ namespace RE
REL::Relocation<func_t> func{ REL::ID(110912) };
return func(a_entryPoint, a_perkOwner, a_args...);
}
} // namespace BGSEntryPoint
} // namespace RE
}
}
2 changes: 1 addition & 1 deletion CommonLibSF/include/RE/B/BGSForcedLocRefType.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ namespace RE
std::uint64_t unk10; // 10
};
static_assert(sizeof(BGSForcedLocRefType) == 0x18);
} // namespace RE
}
2 changes: 1 addition & 1 deletion CommonLibSF/include/RE/B/BGSKeyword.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ namespace RE
SF_RTTI_VTABLE(BGSKeyword);
SF_FORMTYPE(KYWD);
};
} // namespace RE
}
2 changes: 1 addition & 1 deletion CommonLibSF/include/RE/B/BGSKeywordForm.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ namespace RE
std::uint64_t unk28;
};
static_assert(sizeof(BGSKeywordForm) == 0x30);
} // namespace RE
}
2 changes: 1 addition & 1 deletion CommonLibSF/include/RE/B/BGSListForm.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ namespace RE
SF_RTTI_VTABLE(BGSListForm);
SF_FORMTYPE(FLST);
};
} // namespace RE
}
2 changes: 1 addition & 1 deletion CommonLibSF/include/RE/B/BGSLocalizedString.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ namespace RE
BSFixedStringCS _data; // 0
};
static_assert(sizeof(BGSLocalizedString) == 0x8);
} // namespace RE
}
2 changes: 1 addition & 1 deletion CommonLibSF/include/RE/B/BGSLocation.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ namespace RE
bool hasBeenEverExplored; // 1DD
//
};
} // namespace RE
}
6 changes: 3 additions & 3 deletions CommonLibSF/include/RE/B/BGSMod.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ namespace RE
void* unk18; // 18
};
static_assert(sizeof(Items) == 0x20);
} // namespace Template
} // namespace BGSMod
} // namespace RE
}
}
}
2 changes: 1 addition & 1 deletion CommonLibSF/include/RE/B/BGSNativeTerminalForm.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ namespace RE
BGSTerminal* terminal; // 08
};
static_assert(sizeof(BGSNativeTerminalForm) == 0x10);
} // namespace RE
}
2 changes: 1 addition & 1 deletion CommonLibSF/include/RE/B/BGSObjectPlacementDefaults.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ namespace RE
std::uint32_t unk18; // 18
};
static_assert(sizeof(BGSObjectPlacementDefaults) == 0x20);
} // namespace RE
}
2 changes: 1 addition & 1 deletion CommonLibSF/include/RE/B/BGSOverridePackCollection.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ namespace RE
BGSListForm* unk40;
};
static_assert(sizeof(BGSOverridePackCollection) == 0x48);
} // namespace RE
}
2 changes: 1 addition & 1 deletion CommonLibSF/include/RE/B/BGSPerkRankArray.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ namespace RE
std::uint32_t perkCount; // 10
};
static_assert(sizeof(BGSPerkRankArray) == 0x18);
} // namespace RE
}
2 changes: 1 addition & 1 deletion CommonLibSF/include/RE/B/BGSPreviewTransform.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ namespace RE
std::uint64_t unk40; // 40
};
static_assert(sizeof(BGSPreviewTransform) == 0x48);
} // namespace RE
}
2 changes: 1 addition & 1 deletion CommonLibSF/include/RE/B/BGSPropertySheet.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ namespace RE
std::uint64_t /* BSTArray<BSTTuple<TESForm*, BGSTypedFormValuePair::SharedVal>>* */ unk08;
};
static_assert(sizeof(BGSPropertySheet) == 0x10);
} // namespace RE
}
2 changes: 1 addition & 1 deletion CommonLibSF/include/RE/B/BGSScene.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ namespace RE

//
};
} // namespace RE
}
2 changes: 1 addition & 1 deletion CommonLibSF/include/RE/B/BGSSkinForm.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ namespace RE
TESObjectARMO* formSkin; // 08
};
static_assert(sizeof(BGSSkinForm) == 0x10);
} // namespace RE
}
2 changes: 1 addition & 1 deletion CommonLibSF/include/RE/B/BGSSnapTemplateComponent.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ namespace RE
std::uint64_t unk10; // 10
};
static_assert(sizeof(BGSSnapTemplateComponent) == 0x18);
} // namespace RE
}
2 changes: 1 addition & 1 deletion CommonLibSF/include/RE/B/BGSTerminal.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ namespace RE
public:
SF_RTTI_VTABLE(BGSTerminal);
};
} // namespace RE
}
4 changes: 2 additions & 2 deletions CommonLibSF/include/RE/B/BSFixedString.h
Original file line number Diff line number Diff line change
Expand Up @@ -200,10 +200,10 @@ namespace RE
extern template class BSFixedString<char, true>;
extern template class BSFixedString<wchar_t, false>;
extern template class BSFixedString<wchar_t, true>;
} // namespace detail
}

using BSFixedString = detail::BSFixedString<char, false>;
using BSFixedStringCS = detail::BSFixedString<char, true>;
using BSFixedStringW = detail::BSFixedString<wchar_t, false>;
using BSFixedStringWCS = detail::BSFixedString<wchar_t, true>;
} // namespace RE
}
2 changes: 1 addition & 1 deletion CommonLibSF/include/RE/B/BSInputEventReceiver.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ namespace RE
std::uint32_t currInputTimeCount; // 08
};
static_assert(sizeof(BSInputEventReceiver) == 0x10);
} // namespace RE
}
28 changes: 28 additions & 0 deletions CommonLibSF/include/RE/B/BSInputEventUser.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#pragma once

namespace RE
{
class BSInputEventUser
{
public:
SF_RTTI_VTABLE(BSInputEventUser);

virtual ~BSInputEventUser() = default; // 00

// add
virtual void Unk_01(void); // 01
virtual void Unk_02(void); // 02
virtual void Unk_03(void); // 03
virtual void Unk_04(void); // 04
virtual void Unk_05(void); // 05
virtual void Unk_06(void); // 06
virtual void Unk_07(void); // 07
virtual void Unk_08(void); // 08
virtual void Unk_09(void); // 09

// members
std::uint8_t pad08[0x30]; // 08
bool inputEventHandlingEnabled{ true }; // 38
};
static_assert(sizeof(BSInputEventUser) == 0x40);
}
2 changes: 1 addition & 1 deletion CommonLibSF/include/RE/B/BSIntrusiveRefCounted.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ namespace RE
std::uint32_t unk04; // 04
};
static_assert(sizeof(BSIntrusiveRefCounted) == 0x08);
} // namespace RE
}
4 changes: 2 additions & 2 deletions CommonLibSF/include/RE/B/BSReflection.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,5 @@ namespace RE
void* data; // 08
};
static_assert(sizeof(TypedData) == 0x10);
} // namespace BSReflection
} // namespace RE
}
}
Loading

0 comments on commit d35ddec

Please sign in to comment.