Skip to content

Commit 8a11094

Browse files
qudixqudix
authored
feat: merge pr #56 from libxse/dev/havok
feat: dev/havok
2 parents de5a57b + a4c1c0d commit 8a11094

274 files changed

Lines changed: 5816 additions & 1858 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎include/RE/A/AIProcess.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include "RE/B/BSPointerHandle.h"
88
#include "RE/B/BSSimpleList.h"
99
#include "RE/D/DEFAULT_OBJECT.h"
10-
#include "RE/N/NiPoint.h"
10+
#include "RE/N/NiPoint3.h"
1111

1212
namespace RE
1313
{

‎include/RE/A/ActiveEffect.h‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace RE
1616

1717
namespace MagicSystem
1818
{
19-
enum class CastingSource;
19+
enum class CastingSource : std::int32_t;
2020
}
2121

2222
class __declspec(novtable) ActiveEffect :
@@ -47,7 +47,7 @@ namespace RE
4747

4848
enum class ConditionStatus : std::uint32_t
4949
{
50-
kNotAvailable = static_cast<std::underlying_type_t<ConditionStatus>>(-1),
50+
kNotAvailable = 0xFFFFFFFF,
5151
kFalse = 0,
5252
kTrue = 1
5353
};
@@ -62,23 +62,23 @@ namespace RE
6262
}
6363

6464
// members
65-
ActiveEffectReferenceEffectController hitEffectController; // 0C
66-
BSSoundHandle persistentSound; // 30
67-
ActorHandle caster; // 38
68-
NiPointer<NiNode> sourceNode; // 40
69-
MagicItem* spell; // 48
70-
EffectItem* effect; // 50
71-
MagicTarget* target; // 58
72-
TESBoundObject* source; // 60
73-
BSSimpleList<ReferenceEffect*>* hitEffects; // 68
74-
MagicItem* displacementSpell; // 70
75-
float elapsedSeconds; // 74
76-
float duration; // 78
77-
float magnitude; // 7C
78-
REX::TEnumSet<Flags, std::uint32_t> flags; // 80
79-
REX::TEnumSet<ConditionStatus, std::uint32_t> conditionStatus; // 84
80-
std::uint16_t uniqueID; // 8C
81-
REX::TEnumSet<MagicSystem::CastingSource, std::uint32_t> castingSource; // 90
65+
ActiveEffectReferenceEffectController hitEffectController; // 0C
66+
BSSoundHandle persistentSound; // 30
67+
ActorHandle caster; // 38
68+
NiPointer<NiNode> sourceNode; // 40
69+
MagicItem* spell; // 48
70+
EffectItem* effect; // 50
71+
MagicTarget* target; // 58
72+
TESBoundObject* source; // 60
73+
BSSimpleList<ReferenceEffect*>* hitEffects; // 68
74+
MagicItem* displacementSpell; // 70
75+
float elapsedSeconds; // 74
76+
float duration; // 78
77+
float magnitude; // 7C
78+
REX::TEnumSet<Flags, std::uint32_t> flags; // 80
79+
ConditionStatus conditionStatus; // 84
80+
std::uint16_t uniqueID; // 8C
81+
MagicSystem::CastingSource castingSource; // 90
8282
};
8383
static_assert(sizeof(ActiveEffect) == 0x98);
8484
}

‎include/RE/A/ActiveEffectReferenceEffectController.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include "RE/B/BSFixedString.h"
44
#include "RE/B/BSPointerHandle.h"
5-
#include "RE/N/NiPoint.h"
5+
#include "RE/N/NiPoint3.h"
66
#include "RE/R/ReferenceEffectController.h"
77

88
namespace RE

‎include/RE/A/Actor.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "RE/I/IPostAnimationChannelUpdateFunctor.h"
1616
#include "RE/M/MagicTarget.h"
1717
#include "RE/M/Modifiers.h"
18-
#include "RE/N/NiPoint.h"
18+
#include "RE/N/NiPoint3.h"
1919
#include "RE/N/NiTFlags.h"
2020
#include "RE/O/ObjectEquipParams.h"
2121
#include "RE/S/SEX.h"

‎include/RE/A/ActorMotionFeedbackData.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
#include "RE/N/NiPoint.h"
3+
#include "RE/N/NiPoint3.h"
44

55
namespace RE
66
{

‎include/RE/A/AimModel.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include "RE/B/BGSAimModel.h"
44
#include "RE/B/BSSpring_SpringState.h"
5-
#include "RE/N/NiPoint.h"
5+
#include "RE/N/NiPoint2.h"
66

77
namespace RE
88
{

‎include/RE/B/BGSCharacterMorph.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "RE/B/BSFixedString.h"
77
#include "RE/B/BSTArray.h"
88
#include "RE/B/BSTHashMap.h"
9-
#include "RE/N/NiPoint.h"
9+
#include "RE/N/NiPoint3.h"
1010

1111
namespace RE
1212
{

‎include/RE/B/BGSExplosionData.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
#include "RE/N/NiPoint.h"
3+
#include "RE/N/NiPoint3.h"
44

55
namespace RE
66
{

‎include/RE/B/BGSPrimitive.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

33
#include "RE/N/NiColor.h"
4-
#include "RE/N/NiPoint.h"
4+
#include "RE/N/NiPoint3.h"
55
#include "RE/N/NiPointer.h"
66

77
namespace RE

‎include/RE/B/BGSStaticCollection.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include "RE/B/BGSModelMaterialSwap.h"
44
#include "RE/B/BSSimpleList.h"
55
#include "RE/B/BSTHashMap.h"
6-
#include "RE/N/NiPoint.h"
6+
#include "RE/N/NiPoint3.h"
77
#include "RE/T/TESBoundObject.h"
88

99
namespace RE

0 commit comments

Comments
 (0)