diff --git a/CommonLibF4/include/RE/Bethesda/BSGraphics.h b/CommonLibF4/include/RE/Bethesda/BSGraphics.h index a6fd4763..2f758d6c 100644 --- a/CommonLibF4/include/RE/Bethesda/BSGraphics.h +++ b/CommonLibF4/include/RE/Bethesda/BSGraphics.h @@ -633,9 +633,9 @@ namespace RE } // members - RenderTargetProperties renderTargetData[100]; // 000 - DepthStencilTargetProperties depthStencilTargetData[12]; // C80 - CubeMapRenderTargetProperties cubeMapRenderTargetData[1]; // DA0 + RenderTargetProperties renderTargetData[100]; // 000 + DepthStencilTargetProperties depthStencilTargetData[12]; // C80 + CubeMapRenderTargetProperties cubeMapRenderTargetData[1]; // DA0 std::byte padDC4[0x30]; std::uint32_t renderTargetID[100]; // DC4 std::uint32_t depthStencilTargetID[12]; // F54 diff --git a/CommonLibF4/include/RE/Bethesda/IMenu.h b/CommonLibF4/include/RE/Bethesda/IMenu.h index f6405186..91398f5f 100644 --- a/CommonLibF4/include/RE/Bethesda/IMenu.h +++ b/CommonLibF4/include/RE/Bethesda/IMenu.h @@ -630,14 +630,14 @@ namespace RE void CreateAndSetFiltersToColor(const NiColor& a_color, float a_brightness) { - using func_t = void (BSGFxShaderFXTarget::*)(const NiColor&, float); + using func_t = void (BSGFxShaderFXTarget::*)(const NiColor&, float); static REL::Relocation func{ REL::ID(2287028) }; func(this, a_color, a_brightness); } void CreateAndSetFiltersToColor(std::uint8_t a_r, std::uint8_t a_g, std::uint8_t a_b, float a_brightness) { - using func_t = void (BSGFxShaderFXTarget::*)(std::uint8_t, std::uint8_t, std::uint8_t, float); + using func_t = void (BSGFxShaderFXTarget::*)(std::uint8_t, std::uint8_t, std::uint8_t, float); static REL::Relocation func{ REL::ID(783104) }; func(this, a_r, a_g, a_b, a_brightness); } diff --git a/CommonLibF4/include/RE/Bethesda/ImageSpaceModifier.h b/CommonLibF4/include/RE/Bethesda/ImageSpaceModifier.h index dba3d07b..ce3b9403 100644 --- a/CommonLibF4/include/RE/Bethesda/ImageSpaceModifier.h +++ b/CommonLibF4/include/RE/Bethesda/ImageSpaceModifier.h @@ -78,27 +78,27 @@ namespace RE static ImageSpaceModifierInstanceForm* Trigger(TESImageSpaceModifier* a_mod, float a_strength, NiAVObject* a_target) { using func_t = ImageSpaceModifierInstanceForm* (*)(TESImageSpaceModifier*, float, NiAVObject*); - static REL::Relocation func{ REL::ID(2199906) }; + static REL::Relocation func{ REL::ID(2199906) }; return func(a_mod, a_strength, a_target); } static ImageSpaceModifierInstanceForm* Trigger(const BSFixedString& a_name) { using func_t = ImageSpaceModifierInstanceForm* (*)(const BSFixedString&); - static REL::Relocation func{ REL::ID(2199907) }; + static REL::Relocation func{ REL::ID(2199907) }; return func(a_name); } static void Stop(TESImageSpaceModifier* a_mod) { - using func_t = void (*)(TESImageSpaceModifier*); + using func_t = void (*)(TESImageSpaceModifier*); static REL::Relocation func{ REL::ID(2199909) }; return func(a_mod); } static void Stop(const BSFixedString& a_name) { - using func_t = void (*)(const BSFixedString&); + using func_t = void (*)(const BSFixedString&); static REL::Relocation func{ REL::ID(2199910) }; return func(a_name); } diff --git a/CommonLibF4/include/RE/Bethesda/TESForms.h b/CommonLibF4/include/RE/Bethesda/TESForms.h index 871016ca..498e90bf 100644 --- a/CommonLibF4/include/RE/Bethesda/TESForms.h +++ b/CommonLibF4/include/RE/Bethesda/TESForms.h @@ -832,7 +832,7 @@ namespace RE template [[nodiscard]] bool Is(Args... a_args) const noexcept // - requires(std::same_as && ...) + requires(std::same_as&&...) { return (Is(a_args) || ...); } @@ -856,7 +856,7 @@ namespace RE template [[nodiscard]] bool IsNot(Args... a_args) const noexcept // - requires(std::same_as && ...) + requires(std::same_as&&...) { return (IsNot(a_args) && ...); }