Skip to content

Commit

Permalink
maintenance
Browse files Browse the repository at this point in the history
  • Loading branch information
@shad0wshayd3 @github-actions
shad0wshayd3 authored and github-actions[bot] committed May 4, 2024
1 parent 9374e9a commit 0c590df
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 36 deletions.
2 changes: 1 addition & 1 deletion CommonLibF4/include/RE/Bethesda/BSLock.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace RE
WinAPI::CRITICAL_SECTION criticalSection; // 00
};
static_assert(sizeof(BSCriticalSection) == 0x28);

class BSNonReentrantSpinLock
{
public:
Expand Down
2 changes: 1 addition & 1 deletion CommonLibF4/include/RE/Bethesda/BSShaderProperty.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ namespace RE
kMultilayer,
kBacklightMask,
kSmoothSpec = kBacklightMask,

kTotal,
};

Expand Down
10 changes: 5 additions & 5 deletions CommonLibF4/include/RE/Bethesda/Events.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ namespace RE
REL::Relocation<func_t> func{ REL::ID(1251703) };
return func();
}

// members
NiPointer<TESObjectREFR> actor; // 00
std::uint32_t baseObject; // 08
Expand Down Expand Up @@ -609,7 +609,7 @@ namespace RE
};
static_assert(sizeof(TESFurnitureEvent) == 0x18);

struct DamageImpactData
struct DamageImpactData
{
public:
// members
Expand Down Expand Up @@ -689,7 +689,7 @@ namespace RE
REL::Relocation<func_t> func{ REL::ID(1411899) };
return func();
}

// members
HitData hitData; // 000
NiPointer<TESObjectREFR> target; // 0E0
Expand All @@ -710,7 +710,7 @@ namespace RE
REL::Relocation<func_t> func{ REL::ID(1327824) };
return func();
}

// members
NiPointer<TESObjectREFR> target; // 00
NiPointer<TESObjectREFR> caster; // 08
Expand All @@ -727,7 +727,7 @@ namespace RE
REL::Relocation<func_t> func{ REL::ID(609604) };
return func();
}

// members
std::uint32_t formId; // 00
bool loaded; // 04
Expand Down
12 changes: 6 additions & 6 deletions CommonLibF4/include/RE/Bethesda/ImageSpaceEffect.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ namespace RE
static_assert(sizeof(ImageSpaceEffectOption) == 0xC8);

class __declspec(novtable) ImageSpaceEffectFullScreenBlur :
public ImageSpaceEffect // 00
public ImageSpaceEffect // 00
{
public:
static constexpr auto RTTI{ RTTI::ImageSpaceEffectFullScreenBlur };
Expand All @@ -125,7 +125,7 @@ namespace RE
static_assert(sizeof(ImageSpaceEffectFullScreenBlur) == 0x128);

class __declspec(novtable) ImageSpaceEffectGetHit :
public ImageSpaceEffect // 00
public ImageSpaceEffect // 00
{
public:
static constexpr auto RTTI{ RTTI::ImageSpaceEffectGetHit };
Expand All @@ -150,7 +150,7 @@ namespace RE
static_assert(sizeof(ImageSpaceEffectGetHit) == 0x108);

class __declspec(novtable) ImageSpaceEffectMotionBlur :
public ImageSpaceEffect // 00
public ImageSpaceEffect // 00
{
public:
static constexpr auto RTTI{ RTTI::ImageSpaceEffectMotionBlur };
Expand All @@ -166,7 +166,7 @@ namespace RE
static_assert(sizeof(ImageSpaceEffectMotionBlur) == 0xB0);

class __declspec(novtable) ImageSpaceEffectPipboyScreen :
public ImageSpaceEffect // 00
public ImageSpaceEffect // 00
{
public:
static constexpr auto RTTI{ RTTI::ImageSpaceEffectPipboyScreen };
Expand All @@ -188,7 +188,7 @@ namespace RE
static_assert(sizeof(ImageSpaceEffectPipboyScreen) == 0xC0);

class __declspec(novtable) ImageSpaceEffectRadialBlur :
public ImageSpaceEffect // 00
public ImageSpaceEffect // 00
{
public:
static constexpr auto RTTI{ RTTI::ImageSpaceEffectRadialBlur };
Expand All @@ -206,7 +206,7 @@ namespace RE
static_assert(sizeof(ImageSpaceEffectRadialBlur) == 0xB0);

class __declspec(novtable) ImageSpaceEffectTemporalAA :
public ImageSpaceEffect // 00
public ImageSpaceEffect // 00
{
public:
static constexpr auto RTTI{ RTTI::ImageSpaceEffectTemporalAA };
Expand Down
2 changes: 1 addition & 1 deletion CommonLibF4/include/RE/Bethesda/ImageSpaceModifier.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ namespace RE

static void Stop(TESImageSpaceModifier* a_mod)
{
using func_t = void (*)(TESImageSpaceModifier* );
using func_t = void (*)(TESImageSpaceModifier*);
REL::Relocation<func_t> func{ REL::ID(217873) };
return func(a_mod);
}
Expand Down
2 changes: 1 addition & 1 deletion CommonLibF4/include/RE/Bethesda/ReferenceEffectController.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ namespace RE
public:
static constexpr auto RTTI{ RTTI::SkyEffectController };
static constexpr auto VTABLE{ VTABLE::SkyEffectController };

// override (ReferenceEffectController)
void RemoveHitEffect(ReferenceEffect* a_refEffect) override; // 0A - { return; }
TESObjectREFR* GetTargetReference() override; // 0B - { return g_thePlayer; }
Expand Down
4 changes: 2 additions & 2 deletions CommonLibF4/include/RE/Bethesda/TESForms.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -822,7 +822,7 @@ namespace RE
template <class... Args>

[[nodiscard]] bool Is(Args... a_args) const noexcept //
requires(std::same_as<Args, ENUM_FORM_ID> && ...)
requires(std::same_as<Args, ENUM_FORM_ID>&&...)
{
return (Is(a_args) || ...);
}
Expand All @@ -846,7 +846,7 @@ namespace RE
template <class... Args>

[[nodiscard]] bool IsNot(Args... a_args) const noexcept //
requires(std::same_as<Args, ENUM_FORM_ID> && ...)
requires(std::same_as<Args, ENUM_FORM_ID>&&...)
{
return (IsNot(a_args) && ...);
}
Expand Down
22 changes: 11 additions & 11 deletions CommonLibF4/include/RE/Bethesda/TESObjectREFRs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -685,12 +685,12 @@ namespace RE
}

ModelReferenceEffect* ApplyArtObject(
BGSArtObject* a_art,
float a_time = -1.0f,
TESObjectREFR* a_facingRef = nullptr,
bool a_attachToCamera = false,
bool a_inheritRotation = false,
NiAVObject* a_3D = nullptr,
BGSArtObject* a_art,
float a_time = -1.0f,
TESObjectREFR* a_facingRef = nullptr,
bool a_attachToCamera = false,
bool a_inheritRotation = false,
NiAVObject* a_3D = nullptr,
bool a_interfaceEffect = false)
{
using func_t = decltype(&TESObjectREFR::ApplyArtObject);
Expand All @@ -699,12 +699,12 @@ namespace RE
}

ShaderReferenceEffect* ApplyEffectShader(
TESEffectShader* a_art,
TESEffectShader* a_art,
float a_time = -1.0f,
TESObjectREFR* a_facingRef = nullptr,
TESObjectREFR* a_facingRef = nullptr,
bool a_attachToCamera = false,
bool a_inheritRotation = false,
NiAVObject* a_3D = nullptr,
bool a_inheritRotation = false,
NiAVObject* a_3D = nullptr,
bool a_interfaceEffect = false)
{
using func_t = decltype(&TESObjectREFR::ApplyEffectShader);
Expand Down Expand Up @@ -737,7 +737,7 @@ namespace RE
REL::Relocation<func_t> func{ REL::ID(1135470) };
return func(this);
}

[[nodiscard]] const char* GetDisplayFullName()
{
using func_t = decltype(&TESObjectREFR::GetDisplayFullName);
Expand Down
2 changes: 1 addition & 1 deletion CommonLibF4/include/RE/Bethesda/bhkCharacterController.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ namespace RE

struct DamageImpactData;
struct MoveData;

class hknpMotionPropertiesId
{
public:
Expand Down
9 changes: 2 additions & 7 deletions ExampleProject/src/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,9 @@ extern "C" DLLEXPORT bool F4SEAPI F4SEPlugin_Query(const F4SE::QueryInterface* a
return true;
}


void MessageCallback(F4SE::MessagingInterface::Message* msg)
{
switch (msg->type)
{
switch (msg->type) {
case F4SE::MessagingInterface::kGameDataReady:
break;
case F4SE::MessagingInterface::kNewGame:
Expand All @@ -58,18 +56,15 @@ void MessageCallback(F4SE::MessagingInterface::Message* msg)
default:
break;
}

}


extern "C" DLLEXPORT bool F4SEAPI F4SEPlugin_Load(const F4SE::LoadInterface* a_f4se)
{
F4SE::Init(a_f4se);

logger::info("hello world!");

if (!F4SE::GetMessagingInterface()->RegisterListener(MessageCallback))
{
if (!F4SE::GetMessagingInterface()->RegisterListener(MessageCallback)) {
logger::info("Cannot register listener!");
return false;
}
Expand Down

0 comments on commit 0c590df

Please sign in to comment.