diff --git a/CommonLibF4/include/RE/Bethesda/BSLock.h b/CommonLibF4/include/RE/Bethesda/BSLock.h index bbd95a09..55e5f290 100644 --- a/CommonLibF4/include/RE/Bethesda/BSLock.h +++ b/CommonLibF4/include/RE/Bethesda/BSLock.h @@ -9,7 +9,7 @@ namespace RE WinAPI::CRITICAL_SECTION criticalSection; // 00 }; static_assert(sizeof(BSCriticalSection) == 0x28); - + class BSNonReentrantSpinLock { public: diff --git a/CommonLibF4/include/RE/Bethesda/BSShaderProperty.h b/CommonLibF4/include/RE/Bethesda/BSShaderProperty.h index 2f86c1ed..c3dfd3c5 100644 --- a/CommonLibF4/include/RE/Bethesda/BSShaderProperty.h +++ b/CommonLibF4/include/RE/Bethesda/BSShaderProperty.h @@ -35,7 +35,7 @@ namespace RE kMultilayer, kBacklightMask, kSmoothSpec = kBacklightMask, - + kTotal, }; diff --git a/CommonLibF4/include/RE/Bethesda/Events.h b/CommonLibF4/include/RE/Bethesda/Events.h index 533f608a..2a6784f0 100644 --- a/CommonLibF4/include/RE/Bethesda/Events.h +++ b/CommonLibF4/include/RE/Bethesda/Events.h @@ -576,7 +576,7 @@ namespace RE REL::Relocation func{ REL::ID(1251703) }; return func(); } - + // members NiPointer actor; // 00 std::uint32_t baseObject; // 08 @@ -609,7 +609,7 @@ namespace RE }; static_assert(sizeof(TESFurnitureEvent) == 0x18); - struct DamageImpactData + struct DamageImpactData { public: // members @@ -689,7 +689,7 @@ namespace RE REL::Relocation func{ REL::ID(1411899) }; return func(); } - + // members HitData hitData; // 000 NiPointer target; // 0E0 @@ -710,7 +710,7 @@ namespace RE REL::Relocation func{ REL::ID(1327824) }; return func(); } - + // members NiPointer target; // 00 NiPointer caster; // 08 @@ -727,7 +727,7 @@ namespace RE REL::Relocation func{ REL::ID(609604) }; return func(); } - + // members std::uint32_t formId; // 00 bool loaded; // 04 diff --git a/CommonLibF4/include/RE/Bethesda/ImageSpaceEffect.h b/CommonLibF4/include/RE/Bethesda/ImageSpaceEffect.h index 6e654644..43cd8727 100644 --- a/CommonLibF4/include/RE/Bethesda/ImageSpaceEffect.h +++ b/CommonLibF4/include/RE/Bethesda/ImageSpaceEffect.h @@ -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 }; @@ -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 }; @@ -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 }; @@ -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 }; @@ -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 }; @@ -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 }; diff --git a/CommonLibF4/include/RE/Bethesda/ImageSpaceModifier.h b/CommonLibF4/include/RE/Bethesda/ImageSpaceModifier.h index 93bd3a6d..9af84ce7 100644 --- a/CommonLibF4/include/RE/Bethesda/ImageSpaceModifier.h +++ b/CommonLibF4/include/RE/Bethesda/ImageSpaceModifier.h @@ -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{ REL::ID(217873) }; return func(a_mod); } diff --git a/CommonLibF4/include/RE/Bethesda/ReferenceEffectController.h b/CommonLibF4/include/RE/Bethesda/ReferenceEffectController.h index 07e20464..58d8245d 100644 --- a/CommonLibF4/include/RE/Bethesda/ReferenceEffectController.h +++ b/CommonLibF4/include/RE/Bethesda/ReferenceEffectController.h @@ -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; } diff --git a/CommonLibF4/include/RE/Bethesda/TESForms.h b/CommonLibF4/include/RE/Bethesda/TESForms.h index 2a117361..8dd626ff 100644 --- a/CommonLibF4/include/RE/Bethesda/TESForms.h +++ b/CommonLibF4/include/RE/Bethesda/TESForms.h @@ -822,7 +822,7 @@ namespace RE template [[nodiscard]] bool Is(Args... a_args) const noexcept // - requires(std::same_as && ...) + requires(std::same_as&&...) { return (Is(a_args) || ...); } @@ -846,7 +846,7 @@ namespace RE template [[nodiscard]] bool IsNot(Args... a_args) const noexcept // - requires(std::same_as && ...) + requires(std::same_as&&...) { return (IsNot(a_args) && ...); } diff --git a/CommonLibF4/include/RE/Bethesda/TESObjectREFRs.h b/CommonLibF4/include/RE/Bethesda/TESObjectREFRs.h index 9d9adfa7..87c2f39e 100644 --- a/CommonLibF4/include/RE/Bethesda/TESObjectREFRs.h +++ b/CommonLibF4/include/RE/Bethesda/TESObjectREFRs.h @@ -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); @@ -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); @@ -737,7 +737,7 @@ namespace RE REL::Relocation func{ REL::ID(1135470) }; return func(this); } - + [[nodiscard]] const char* GetDisplayFullName() { using func_t = decltype(&TESObjectREFR::GetDisplayFullName); diff --git a/CommonLibF4/include/RE/Bethesda/bhkCharacterController.h b/CommonLibF4/include/RE/Bethesda/bhkCharacterController.h index 97a43eb5..4e0f3ec5 100644 --- a/CommonLibF4/include/RE/Bethesda/bhkCharacterController.h +++ b/CommonLibF4/include/RE/Bethesda/bhkCharacterController.h @@ -35,7 +35,7 @@ namespace RE struct DamageImpactData; struct MoveData; - + class hknpMotionPropertiesId { public: diff --git a/ExampleProject/src/main.cpp b/ExampleProject/src/main.cpp index bdc1f7f7..ca8aced2 100644 --- a/ExampleProject/src/main.cpp +++ b/ExampleProject/src/main.cpp @@ -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: @@ -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; }