Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions include/RE/B/BGSAwakeSoundData.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace RE
class BGSAwakeSoundData
{
public:
enum class eState : std::uint32_t
enum class State : std::uint32_t
{
kPlaying = 0x0,
kPaused = 0x1,
Expand All @@ -16,10 +16,10 @@ namespace RE
kTotal = 0x3
};

BSSoundHandle sound; // 00
std::uint32_t soundFormID; // 08
float volume; // 0C
BGSAwakeSoundData::eState state; // 10
BSSoundHandle sound; // 00
std::uint32_t soundFormID; // 08
float volume; // 0C
BGSAwakeSoundData::State state; // 10
};
static_assert(sizeof(BGSAwakeSoundData) == 0x14);
}
2 changes: 1 addition & 1 deletion include/RE/E/EXTRA_DATA_TYPE.h
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ namespace RE
kPrimitive, //
kOpenCloseActivateRef, //
kAnimNoteReceiver, //
kAmmo, //
kAmmo, // ExtraAmmo
kPatrolRefData, //
kPackageData, //
kOcclusionShape, //
Expand Down
19 changes: 19 additions & 0 deletions include/RE/E/ExtraAmmo.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#pragma once

#include "RE/B/BSExtraData.h"

namespace RE
{
class __declspec(novtable) ExtraAmmo :
public BSExtraData // 00
{
public:
static constexpr auto RTTI{ RTTI::ExtraAmmo };
static constexpr auto VTABLE{ VTABLE::ExtraAmmo };
static constexpr auto TYPE{ EXTRA_DATA_TYPE::kAmmo };

// members
std::uint32_t count; // 18
};
static_assert(sizeof(ExtraAmmo) == 0x20);
}
7 changes: 7 additions & 0 deletions include/RE/F/FavoritesManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,13 @@ namespace RE
return func(this, a_quickkeyIndex);
}

[[nodiscard]] void ClearCurrentAmmoCount()
{
using func_t = decltype(&FavoritesManager::ClearCurrentAmmoCount);
static REL::Relocation<func_t> func{ ID::FavoritesManager::ClearCurrentAmmoCount };
return func(this);
}

// members
TESBoundObject* storedFavTypes[12]; // 090
NiPointer<QueuedFile> bufferedFavGeometries[12]; // 0F0
Expand Down
1 change: 1 addition & 0 deletions include/RE/Fallout.h
Original file line number Diff line number Diff line change
Expand Up @@ -645,6 +645,7 @@
#include "RE/E/Explosion.h"
#include "RE/E/ExteriorCellSingleton.h"
#include "RE/E/ExtraAliasInstanceArray.h"
#include "RE/E/ExtraAmmo.h"
#include "RE/E/ExtraBendableSplineParams.h"
#include "RE/E/ExtraCellWaterType.h"
#include "RE/E/ExtraCharge.h"
Expand Down
6 changes: 6 additions & 0 deletions include/RE/IDs.h
Original file line number Diff line number Diff line change
Expand Up @@ -973,6 +973,7 @@ namespace RE::ID
inline constexpr REL::ID UseQuickkeyItem{ 2248744 };
inline constexpr REL::ID HandleEvent{ 2248740 };
inline constexpr REL::ID Call{ 2248766 };
inline constexpr REL::ID ClearCurrentAmmoCount{ 2248745 };
}

namespace FlatScreenModel
Expand Down Expand Up @@ -1894,6 +1895,11 @@ namespace RE::ID
inline constexpr REL::ID GetEventSource{ 2201848 };
}

namespace TESLocationClearedEvent
{
inline constexpr REL::ID GetEventSource{ 2201849 };
}

namespace TESMagicEffectApplyEvent
{
inline constexpr REL::ID GetEventSource{ 2201851 };
Expand Down
7 changes: 7 additions & 0 deletions include/RE/T/TESLocationClearedEvent.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ namespace RE
class TESLocationClearedEvent
{
public:
[[nodiscard]] static BSTEventSource<TESLocationClearedEvent>* GetEventSource()
{
using func_t = decltype(&TESLocationClearedEvent::GetEventSource);
static REL::Relocation<func_t> func{ ID::TESLocationClearedEvent::GetEventSource };
return func();
}

// members
const BGSLocation* location; // 00
};
Expand Down
9 changes: 9 additions & 0 deletions include/RE/T/TESObjectACTI.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,15 @@ namespace RE
static constexpr auto VTABLE{ VTABLE::TESObjectACTI };
static constexpr auto FORM_ID{ ENUM_FORM_ID::kACTI };

enum class ActiFlags
{
kNoDisplacement = 0x1,
kNoSandbox = 0x2,
kIsProceduralWater = 0x4,
kIsLODWater = 0x8,
kIsRadio = 0x10
};

// members
BGSSoundDescriptorForm* soundLoop; // 128
BGSSoundDescriptorForm* soundActivate; // 130
Expand Down