Skip to content

Commit fab895c

Browse files
shad0wshayd3github-actions[bot]
authored andcommitted
maintenance
1 parent ae465ba commit fab895c

File tree

8 files changed

+71
-73
lines changed

8 files changed

+71
-73
lines changed

CommonLibF4/include/RE/Bethesda/BGSCharacterTint.h

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -78,17 +78,17 @@ namespace RE
7878
virtual ~Entry(); // 00
7979

8080
// add
81-
virtual float GetDefaultValue() { return 0.0F; } // 01
82-
virtual void InitItem(TESForm* a_owner); // 02
83-
virtual void CopyData(BGSCharacterTint::Template::Entry* a_copy); // 03
84-
virtual void LoadImpl(TESFile* a_file) = 0; // 04
81+
virtual float GetDefaultValue() { return 0.0F; } // 01
82+
virtual void InitItem(TESForm* a_owner); // 02
83+
virtual void CopyData(BGSCharacterTint::Template::Entry* a_copy); // 03
84+
virtual void LoadImpl(TESFile* a_file) = 0; // 04
8585

8686
// members
87-
BGSLocalizedString name; // 08
88-
TESCondition chargenConditions; // 10
87+
BGSLocalizedString name; // 08
88+
TESCondition chargenConditions; // 10
8989
stl::enumeration<BGSCharacterTint::EntrySlot, std::int32_t> slot; // 18
90-
const std::uint16_t uniqueID{ 0 }; // 1C
91-
std::int8_t flags; // 1E
90+
const std::uint16_t uniqueID{ 0 }; // 1C
91+
std::int8_t flags; // 1E
9292
};
9393
static_assert(sizeof(Entry) == 0x20);
9494

@@ -101,10 +101,10 @@ namespace RE
101101

102102
struct ColorValue
103103
{
104-
BGSColorForm* color; // 00
105-
float value; // 08
106-
BGSCharacterTint::BlendOp blendOp; // 0C
107-
std::uint16_t swatchID; // 01
104+
BGSColorForm* color; // 00
105+
float value; // 08
106+
BGSCharacterTint::BlendOp blendOp; // 0C
107+
std::uint16_t swatchID; // 01
108108
};
109109
static_assert(sizeof(ColorValue) == 0x18);
110110

@@ -119,10 +119,10 @@ namespace RE
119119
{
120120
public:
121121
// members
122-
BGSLocalizedString name; // 00
123-
std::uint32_t id; // 08
124-
std::uint32_t chargenIndex; // 0C
125-
BSTArray<BGSCharacterTint::Template::Entry*> entries; // 10
122+
BGSLocalizedString name; // 00
123+
std::uint32_t id; // 08
124+
std::uint32_t chargenIndex; // 0C
125+
BSTArray<BGSCharacterTint::Template::Entry*> entries; // 10
126126
};
127127
static_assert(sizeof(Group) == 0x28);
128128

@@ -141,18 +141,18 @@ namespace RE
141141
static constexpr auto RTTI{ RTTI::BGSCharacterTint__Entry };
142142
static constexpr auto VTABLE{ VTABLE::BGSCharacterTint__Entry };
143143

144-
virtual ~Entry(); // 00
144+
virtual ~Entry(); // 00
145145

146-
virtual bool GetIsIdentical(const Entry* entry); // 08
147-
virtual bool CopyData(const Entry entry); // 10
148-
virtual bool SetFromTemplateDefault(const BGSCharacterTint::Template::Entry* entry); // 18
149-
virtual bool GetMatchesTemplateDefault(const BGSCharacterTint::Template::Entry* entry); // 20
150-
virtual BGSCharacterTint::EntryType GetType(); // 28
146+
virtual bool GetIsIdentical(const Entry* entry); // 08
147+
virtual bool CopyData(const Entry entry); // 10
148+
virtual bool SetFromTemplateDefault(const BGSCharacterTint::Template::Entry* entry); // 18
149+
virtual bool GetMatchesTemplateDefault(const BGSCharacterTint::Template::Entry* entry); // 20
150+
virtual BGSCharacterTint::EntryType GetType(); // 28
151151

152152
// Members
153-
BGSCharacterTint::Template::Entry* template; // 08
154-
const std::uint16_t idLink; // 10
155-
std::uint8_t tingingValue; // 12
153+
BGSCharacterTint::Template::Entry* template; // 08
154+
const std::uint16_t idLink; // 10
155+
std::uint8_t tingingValue; // 12
156156
};
157157
static_assert(sizeof(Entry) == 0x18);
158158

@@ -173,8 +173,8 @@ namespace RE
173173
static constexpr auto VTABLE{ VTABLE::BGSCharacterTint__PaletteEntry };
174174

175175
// members
176-
std::uint32_t tintingColor; // 18
177-
std::uint16_t swatchID; // 1C
176+
std::uint32_t tintingColor; // 18
177+
std::uint16_t swatchID; // 1C
178178
};
179179
static_assert(sizeof(PaletteEntry) == 0x20);
180180

@@ -190,7 +190,7 @@ namespace RE
190190
class Entries
191191
{
192192
public:
193-
BSTArray<BGSCharacterTint::Entry* > entriesA;
193+
BSTArray<BGSCharacterTint::Entry*> entriesA;
194194
};
195195
static_assert(sizeof(Entries) == 0x18);
196196
}

CommonLibF4/include/RE/Bethesda/BGSStoryManagerTreeForm.h

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ namespace RE
8585
void ParseString(BSStringT<char>& inOutText, const TESQuest* quest, std::uint32_t instanceID)
8686
{
8787
using func_t = decltype(&BGSQuestInstanceText::ParseString);
88-
REL::Relocation<func_t> func{ REL::ID(141681) }; // Update
88+
REL::Relocation<func_t> func{ REL::ID(141681) }; // Update
8989
return func(this, inOutText, quest, instanceID);
9090
}
9191

@@ -104,11 +104,11 @@ namespace RE
104104
static_assert(sizeof(GlobabValueData) == 0x10);
105105

106106
// Members
107-
std::uint32_t ID; // 00
108-
BSTArray<BGSQuestInstanceText::StringData> StringData; // 08
109-
BSTArray<BGSQuestInstanceText::GlobabValueData> ValueData; // 20
110-
std::uint16_t JournalStage; // 38
111-
std::uint16_t JournalStageItem; // 3A
107+
std::uint32_t ID; // 00
108+
BSTArray<BGSQuestInstanceText::StringData> StringData; // 08
109+
BSTArray<BGSQuestInstanceText::GlobabValueData> ValueData; // 20
110+
std::uint16_t JournalStage; // 38
111+
std::uint16_t JournalStageItem; // 3A
112112
};
113113
static_assert(sizeof(BGSQuestInstanceText) == 0x40);
114114

@@ -139,7 +139,6 @@ namespace RE
139139
return func(this, a_result, a_aiAliasID);
140140
}
141141

142-
143142
// members
144143
BSTArray<BGSQuestInstanceText*> instanceData; // 038
145144
std::uint32_t currentInstanceID; // 050

CommonLibF4/include/RE/Bethesda/BSExtraData.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,6 @@ namespace RE
353353
ExtraHealth();
354354
ExtraHealth(float health);
355355

356-
357356
// members
358357
float health; // 18
359358
};

CommonLibF4/include/RE/Bethesda/Events.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ namespace RE
495495
static_assert(sizeof(HUDPerkVaultBoyData) == 0x18);
496496

497497
class HUDPerkVaultBoySwfDisplayEvent :
498-
public BSTValueEvent<HUDPerkVaultBoyData> // 00
498+
public BSTValueEvent<HUDPerkVaultBoyData> // 00
499499
{
500500
public:
501501
};
@@ -817,7 +817,7 @@ namespace RE
817817
{
818818
public:
819819
// Members
820-
TESObjectREFR* hObjectInitialized; // 00
820+
TESObjectREFR* hObjectInitialized; // 00
821821
};
822822
static_assert(sizeof(TESInitScriptEvent) == 0x08);
823823

@@ -826,7 +826,7 @@ namespace RE
826826
public:
827827
[[nodiscard]] static TESInitScriptEventSource* GetSingleton()
828828
{
829-
REL::Relocation<TESInitScriptEventSource*> singleton{ REL::ID(444105) }; // Needs updating.
829+
REL::Relocation<TESInitScriptEventSource*> singleton{ REL::ID(444105) }; // Needs updating.
830830
return singleton.get();
831831
}
832832
};

CommonLibF4/include/RE/Bethesda/FormComponents.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1742,8 +1742,8 @@ namespace RE
17421742
{
17431743
public:
17441744
// members
1745-
TESForm* form; // 00
1746-
std::int32_t reaction; // 08
1745+
TESForm* form; // 00
1746+
std::int32_t reaction; // 08
17471747
FIGHT_REACTION fightReaction; // 0C
17481748
};
17491749
static_assert(sizeof(GROUP_REACTION) == 0x10);

CommonLibF4/include/RE/Bethesda/IMenu.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1529,7 +1529,7 @@ namespace RE
15291529
static_assert(sizeof(ContainerMenu) == 0x440);
15301530

15311531
class __declspec(novtable) DialogueMenu :
1532-
public GameMenuBase // 00
1532+
public GameMenuBase // 00
15331533
{
15341534
public:
15351535
static constexpr auto RTTI{ RTTI::DialogueMenu };

CommonLibF4/include/RE/Bethesda/MenuTopicManager.h

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,46 +3,46 @@
33
namespace RE
44
{
55
class __declspec(novtable) MenuTopicManager :
6-
public BSTEventSink<MenuOpenCloseEvent>, // 00
7-
public BSTEventSink<PositionPlayerEvent>, // 08
8-
public BSTSingletonSDM<MenuTopicManager> // 10
6+
public BSTEventSink<MenuOpenCloseEvent>, // 00
7+
public BSTEventSink<PositionPlayerEvent>, // 08
8+
public BSTSingletonSDM<MenuTopicManager> // 10
99
{
1010
public:
1111
static constexpr auto RTTI{ RTTI::MenuTopicManager };
1212
static constexpr auto VTABLE{ VTABLE::MenuTopicManager };
1313

1414
[[nodiscard]] static MenuTopicManager* GetSingleton()
1515
{
16-
REL::Relocation<MenuTopicManager**> singleton{ REL::ID(520890) }; // TODO: Update
16+
REL::Relocation<MenuTopicManager**> singleton{ REL::ID(520890) }; // TODO: Update
1717
return singleton*
1818
}
1919

2020
// members
21-
BSPointerHandle<TESObjectREFR, BSUntypedPointerHandle<21, 5>> speaker; // 14
22-
BSPointerHandle<TESObjectREFR, BSUntypedPointerHandle<21, 5>> lastSpeaker; // 18
23-
BSTSmartPointer<BSInputEnableLayer> inputLayer; // 20
24-
float reLookTimer; // 28
25-
float notInMenuTimer; // 2C
26-
float restartMenuOnFocus; // 30
27-
float menuStart; // 34
28-
float buttonShowTimer; // 38
29-
NiPoint3 centerPoint; // 3C
30-
uint32_t numRefsInScene; // 48
31-
bool menuOpen; // 4C
32-
bool shutMenu; // 4D
33-
bool canSkip; // 4E
34-
bool shuttingDown; // 4F
35-
bool menuSlow; // 50
36-
bool doneFOV; // 51
37-
bool leaveMenuOpen; // 52
38-
bool showHelpButton; // 53
39-
bool needEnterDialogueAction; // 54
40-
bool allowInput; // 55
41-
bool 3rdPartyCameraReady; // 56
42-
bool speechChallengeAlwaysSucceed; // 57
43-
bool speechChallengeAlwaysFail; // 58
44-
bool overSceneActor; // 59
45-
bool forceCameraRotationStart; // 5A
21+
BSPointerHandle<TESObjectREFR, BSUntypedPointerHandle<21, 5>> speaker; // 14
22+
BSPointerHandle<TESObjectREFR, BSUntypedPointerHandle<21, 5>> lastSpeaker; // 18
23+
BSTSmartPointer<BSInputEnableLayer> inputLayer; // 20
24+
float reLookTimer; // 28
25+
float notInMenuTimer; // 2C
26+
float restartMenuOnFocus; // 30
27+
float menuStart; // 34
28+
float buttonShowTimer; // 38
29+
NiPoint3 centerPoint; // 3C
30+
uint32_t numRefsInScene; // 48
31+
bool menuOpen; // 4C
32+
bool shutMenu; // 4D
33+
bool canSkip; // 4E
34+
bool shuttingDown; // 4F
35+
bool menuSlow; // 50
36+
bool doneFOV; // 51
37+
bool leaveMenuOpen; // 52
38+
bool showHelpButton; // 53
39+
bool needEnterDialogueAction; // 54
40+
bool allowInput; // 55
41+
bool 3rdPartyCameraReady; // 56
42+
bool speechChallengeAlwaysSucceed; // 57
43+
bool speechChallengeAlwaysFail; // 58
44+
bool overSceneActor; // 59
45+
bool forceCameraRotationStart; // 5A
4646
};
4747
static_assert(sizeof(MenuTopicManager) = 0x60)
4848
}

CommonLibF4/include/RE/Bethesda/TESBoundObjects.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@ namespace RE
600600
float criticalDamageMult; // 104
601601
stl::enumeration<STAGGER_MAGNITUDE, std::int32_t> staggerValue; // 108
602602
std::uint32_t value; // 10C
603-
stl::enumeration<WEAPON_FLAGS, std::uint32_t> flags; // 110
603+
stl::enumeration<WEAPON_FLAGS, std::uint32_t> flags; // 110
604604
stl::enumeration<SOUND_LEVEL, std::int32_t> soundLevel; // 114
605605
stl::enumeration<WEAPONHITBEHAVIOR, std::int32_t> hitBehavior; // 118
606606
ActorValueInfo* skill; // 120
@@ -668,7 +668,7 @@ namespace RE
668668

669669
bool IsOneHandedWeapon()
670670
{
671-
retunr (this->weaponData.type.underlying() <= 4 || this->weaponData.type.underlying() == 8);
671+
retunr(this->weaponData.type.underlying() <= 4 || this->weaponData.type.underlying() == 8);
672672
}
673673

674674
bool IsEmbeddedWeapon()

0 commit comments

Comments
 (0)