Skip to content

Commit f6dfaf4

Browse files
powerof3powerof3
authored
Merge pull request #223 from SkyHorizon3/dev
feat: misc RE
2 parents 7b95de7 + 5904b41 commit f6dfaf4

39 files changed

Lines changed: 201 additions & 147 deletions

‎include/RE/A/ActivateChoiceMenuCallbackFunctor.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ namespace RE
1313
~ActivateChoiceMenuCallbackFunctor() override; // 00
1414

1515
// override (IMessageBoxCallback)
16-
void Run(Message a_msg) override; //01
16+
void Run(std::uint8_t a_button) override; //01
1717

1818
// members
19-
std::uint32_t unk10; // 10
20-
std::uint32_t unk14; // 14
19+
ObjectRefHandle unk10; // 10
20+
std::uint32_t unk14; // 14
2121
};
2222
static_assert(sizeof(ActivateChoiceMenuCallbackFunctor) == 0x18);
2323
}

‎include/RE/A/Actor.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -509,6 +509,8 @@ namespace RE
509509
void AddWornOutfit(BGSOutfit* a_outfit, bool a_forceUpdate);
510510
void AllowBleedoutDialogue(bool a_canTalk);
511511
void AllowPCDialogue(bool a_talk);
512+
ACTOR_LOS_LOCATION CalculateLOS(Actor* a_target, float a_viewCone);
513+
NiAVObject* CalculateLOS(const NiPoint3& a_targetPosition, const NiPoint3& a_rayHitPosition, float a_viewCone);
512514
NiPoint3 CalculateLOSLocation(ACTOR_LOS_LOCATION a_location);
513515
bool CanAttackActor(Actor* a_actor);
514516
bool CanFlyHere() const;
@@ -616,6 +618,7 @@ namespace RE
616618
bool IsInRagdollState() const;
617619
bool IsLeveled() const;
618620
bool IsLimbGone(std::uint32_t a_limb);
621+
bool IsMovementAnimationDriven() const;
619622
bool IsMoving() const;
620623
bool IsOnMount() const;
621624
bool IsOverEncumbered() const;

‎include/RE/A/AlchemyMenu.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace RE
2424
virtual ~QuitMenuCallback(); // 00
2525

2626
// override (IMessageBoxCallback)
27-
void Run(Message a_msg) override; // 01
27+
void Run(std::uint8_t a_button) override; // 01
2828

2929
// members
3030
AlchemyMenu* subMenu; // 10
@@ -40,7 +40,7 @@ namespace RE
4040
virtual ~CraftItemCallback(); // 00
4141

4242
// override (IMessageBoxCallback)
43-
void Run(Message a_msg) override; // 01
43+
void Run(std::uint8_t a_button) override; // 01
4444

4545
// members
4646
AlchemyMenu* subMenu; // 10

‎include/RE/B/BGSConstructFormsInAllFilesMap.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ namespace RE
7777
// members
7878
BSTHashMap<TESFile*, BGSConstructFormsInFileMap> files; // 00
7979
BGSConstructedForms constructedForms; // 30
80-
std::uint32_t unk78; // 78
80+
std::uint32_t count; // 78 - sum size of all three BSTArrays
8181
std::uint32_t pad7C; // 7C
8282
};
8383
static_assert(sizeof(BGSConstructFormsInAllFilesMap) == 0x80);

‎include/RE/B/BSInvMarker.h‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,17 @@ namespace RE
1212
inline static constexpr auto Ni_RTTI = NiRTTI_BSInvMarker;
1313
inline static constexpr auto VTABLE = VTABLE_BSInvMarker;
1414

15+
~BSInvMarker() override; // 00
16+
17+
// override (NiExtraData)
18+
const NiRTTI* GetRTTI() const override; // 02
19+
NiObject* CreateClone([[maybe_unused]] NiCloningProcess& a_cloning) override { return this; } // 17
20+
void LoadBinary(NiStream& a_stream) override; // 18
21+
void LinkObject(NiStream& a_stream) override; // 19 - { return; }
22+
bool RegisterStreamables(NiStream& a_stream) override; // 1A
23+
void SaveBinary(NiStream& a_stream) override; // 1B
24+
bool IsEqual(NiObject* a_object) override; // 1C
25+
1526
RE::NiPoint3 GetRotationEulerAnglesXYZ() const;
1627

1728
// members
@@ -22,4 +33,4 @@ namespace RE
2233
std::uint8_t pad22[6]; // 22
2334
};
2435
static_assert(sizeof(BSInvMarker) == 0x28);
25-
}
36+
}

‎include/RE/B/BSShadowDirectionalLight.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace RE
1515

1616
// override (BSShadowLight)
1717
bool GetIsFrustumOrDirectionalLight() override; // 04
18-
void GetIsDirectionalLight() override; // 06
18+
bool GetIsDirectionalLight() override; // 06
1919
void Accumulate(std::uint32_t& a_globalShadowLightCount, std::uint32_t& a_shadowMaskChannel, NiAVObject* a_cullingScene) override; // 09
2020
void Render(std::uint32_t& a_index) override; // 0A
2121
void ReturnShadowmaps() override; // 0C

‎include/RE/B/BSShadowLight.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ namespace RE
1717
REX::W32::XMFLOAT4X4 projection; // 00
1818
NiPointer<NiCamera> camera; // 40
1919
NiPointer<BSShaderAccumulator> shaderAccumulator; // 48
20-
std::uint32_t unk50; // 50
20+
std::uint32_t cullingMode; // 50
2121
RENDER_TARGET_DEPTHSTENCIL renderTarget; // 54
2222
std::uint32_t shadowMapIndex; // 58
2323
NiFrustumPlanes clipPlanes; // 5C
2424
float unitsPerTexel; // CC
2525
NiRect<std::uint32_t> shadowMapRect; // D0
2626
BSCullingProcess* cullingProcess; // E0
2727
bool clearRenderTarget; // E8
28-
bool unkE9; // E9
28+
bool isEnabled; // E9
2929
};
3030
static_assert(sizeof(ShadowMapData) == 0xF0);
3131

@@ -34,7 +34,7 @@ namespace RE
3434
// add
3535
virtual bool GetIsFrustumOrDirectionalLight() = 0; // 04
3636
virtual bool GetIsFrustumLight(); // 05
37-
virtual void GetIsDirectionalLight(); // 06
37+
virtual bool GetIsDirectionalLight(); // 06
3838
virtual bool GetIsParabolicLight(); // 07
3939
virtual bool GetIsOmniLight(); // 08
4040
virtual void Accumulate(std::uint32_t& a_globalShadowLightCount, std::uint32_t& a_shadowMaskChannel, NiAVObject* a_cullingScene) = 0; // 09

‎include/RE/C/ConfirmAndNameCallback.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace RE
1515
~ConfirmAndNameCallback() override; // 00
1616

1717
// override (IMessageBoxCallback)
18-
virtual void Run(Message a_msg) override;
18+
virtual void Run(std::uint8_t a_button) override;
1919

2020
// members
2121
RaceSexMenu* menu; // 10

‎include/RE/C/ConfirmCloseRaceSexMenuCallback.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace RE
1515
~ConfirmCloseRaceSexMenuCallback() override; // 00
1616

1717
// override (IMessageBoxCallback)
18-
virtual void Run(Message a_msg) override;
18+
virtual void Run(std::uint8_t a_button) override;
1919

2020
// members
2121
RaceSexMenu* menu; // 10

‎include/RE/C/ConfirmDestructiveChangesCallback.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace RE
1515
~ConfirmDestructiveChangesCallback() override; // 00
1616

1717
// override (IMessageBoxCallback)
18-
virtual void Run(Message a_msg) override;
18+
virtual void Run(std::uint8_t a_button) override;
1919

2020
// members
2121
RaceSexMenu* menu; // 10

0 commit comments

Comments
 (0)