Skip to content

Commit 0922d0a

Browse files
FlenarnDevFlenarn
andauthored
misc stuff (#59)
* feat: Misc fixes and more additions. * maintenance * feat: BGSDecalEmitter declared. * maintenance * feat: Misc. RE, some stuff needed for custom music stingers RE'd. * feat: Misc small stuff. * maintenance * fix merge conflict --------- Co-authored-by: Flenarn <flenarn@hotmail.com> Co-authored-by: FlenarnDev <FlenarnDev@users.noreply.github.com>
1 parent 939cc4c commit 0922d0a

8 files changed

Lines changed: 55 additions & 6 deletions

File tree

include/RE/B/BGSAwakeSoundData.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace RE
77
class BGSAwakeSoundData
88
{
99
public:
10-
enum class eState : std::uint32_t
10+
enum class State : std::uint32_t
1111
{
1212
kPlaying = 0x0,
1313
kPaused = 0x1,
@@ -16,10 +16,10 @@ namespace RE
1616
kTotal = 0x3
1717
};
1818

19-
BSSoundHandle sound; // 00
20-
std::uint32_t soundFormID; // 08
21-
float volume; // 0C
22-
BGSAwakeSoundData::eState state; // 10
19+
BSSoundHandle sound; // 00
20+
std::uint32_t soundFormID; // 08
21+
float volume; // 0C
22+
BGSAwakeSoundData::State state; // 10
2323
};
2424
static_assert(sizeof(BGSAwakeSoundData) == 0x14);
2525
}

include/RE/E/EXTRA_DATA_TYPE.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ namespace RE
110110
kPrimitive, //
111111
kOpenCloseActivateRef, //
112112
kAnimNoteReceiver, //
113-
kAmmo, //
113+
kAmmo, // ExtraAmmo
114114
kPatrolRefData, //
115115
kPackageData, //
116116
kOcclusionShape, //

include/RE/E/ExtraAmmo.h

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#pragma once
2+
3+
#include "RE/B/BSExtraData.h"
4+
5+
namespace RE
6+
{
7+
class __declspec(novtable) ExtraAmmo :
8+
public BSExtraData // 00
9+
{
10+
public:
11+
static constexpr auto RTTI{ RTTI::ExtraAmmo };
12+
static constexpr auto VTABLE{ VTABLE::ExtraAmmo };
13+
static constexpr auto TYPE{ EXTRA_DATA_TYPE::kAmmo };
14+
15+
// members
16+
std::uint32_t count; // 18
17+
};
18+
static_assert(sizeof(ExtraAmmo) == 0x20);
19+
}

include/RE/F/FavoritesManager.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,13 @@ namespace RE
7474
return func(this, a_quickkeyIndex);
7575
}
7676

77+
[[nodiscard]] void ClearCurrentAmmoCount()
78+
{
79+
using func_t = decltype(&FavoritesManager::ClearCurrentAmmoCount);
80+
static REL::Relocation<func_t> func{ ID::FavoritesManager::ClearCurrentAmmoCount };
81+
return func(this);
82+
}
83+
7784
// members
7885
TESBoundObject* storedFavTypes[12]; // 090
7986
NiPointer<QueuedFile> bufferedFavGeometries[12]; // 0F0

include/RE/Fallout.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -645,6 +645,7 @@
645645
#include "RE/E/Explosion.h"
646646
#include "RE/E/ExteriorCellSingleton.h"
647647
#include "RE/E/ExtraAliasInstanceArray.h"
648+
#include "RE/E/ExtraAmmo.h"
648649
#include "RE/E/ExtraBendableSplineParams.h"
649650
#include "RE/E/ExtraCellWaterType.h"
650651
#include "RE/E/ExtraCharge.h"

include/RE/IDs.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -973,6 +973,7 @@ namespace RE::ID
973973
inline constexpr REL::ID UseQuickkeyItem{ 2248744 };
974974
inline constexpr REL::ID HandleEvent{ 2248740 };
975975
inline constexpr REL::ID Call{ 2248766 };
976+
inline constexpr REL::ID ClearCurrentAmmoCount{ 2248745 };
976977
}
977978

978979
namespace FlatScreenModel
@@ -1894,6 +1895,11 @@ namespace RE::ID
18941895
inline constexpr REL::ID GetEventSource{ 2201848 };
18951896
}
18961897

1898+
namespace TESLocationClearedEvent
1899+
{
1900+
inline constexpr REL::ID GetEventSource{ 2201849 };
1901+
}
1902+
18971903
namespace TESMagicEffectApplyEvent
18981904
{
18991905
inline constexpr REL::ID GetEventSource{ 2201851 };

include/RE/T/TESLocationClearedEvent.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ namespace RE
55
class TESLocationClearedEvent
66
{
77
public:
8+
[[nodiscard]] static BSTEventSource<TESLocationClearedEvent>* GetEventSource()
9+
{
10+
using func_t = decltype(&TESLocationClearedEvent::GetEventSource);
11+
static REL::Relocation<func_t> func{ ID::TESLocationClearedEvent::GetEventSource };
12+
return func();
13+
}
14+
815
// members
916
const BGSLocation* location; // 00
1017
};

include/RE/T/TESObjectACTI.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,15 @@ namespace RE
3232
static constexpr auto VTABLE{ VTABLE::TESObjectACTI };
3333
static constexpr auto FORM_ID{ ENUM_FORM_ID::kACTI };
3434

35+
enum class ActiFlags
36+
{
37+
kNoDisplacement = 0x1,
38+
kNoSandbox = 0x2,
39+
kIsProceduralWater = 0x4,
40+
kIsLODWater = 0x8,
41+
kIsRadio = 0x10
42+
};
43+
3544
// members
3645
BGSSoundDescriptorForm* soundLoop; // 128
3746
BGSSoundDescriptorForm* soundActivate; // 130

0 commit comments

Comments
 (0)