From 2fa86bcd6002d23ddfc10d57937ccaac8bdd2d47 Mon Sep 17 00:00:00 2001 From: AtomCrafty Date: Sun, 30 Jun 2024 13:24:27 +0200 Subject: [PATCH 1/2] Fix flag access functions in IMenu.h --- include/RE/I/IMenu.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/RE/I/IMenu.h b/include/RE/I/IMenu.h index 2624cc1e9..f35efaa6a 100644 --- a/include/RE/I/IMenu.h +++ b/include/RE/I/IMenu.h @@ -96,11 +96,11 @@ namespace RE [[nodiscard]] constexpr bool RequiresUpdate() const noexcept { return menuFlags.all(Flag::kRequiresUpdate); } [[nodiscard]] constexpr bool SkipRenderDuringFreezeFrameScreenshot() const noexcept { return menuFlags.all(Flag::kSkipRenderDuringFreezeFrameScreenshot); } [[nodiscard]] constexpr bool TopmostRenderedMenu() const noexcept { return menuFlags.all(Flag::kTopmostRenderedMenu); } - [[nodiscard]] constexpr bool UpdateUsesCursor() const noexcept { return menuFlags.all(Flag::kUsesBlurredBackground); } - [[nodiscard]] constexpr bool UsesBlurredBackground() const noexcept { return menuFlags.all(Flag::kUsesCursor); } - [[nodiscard]] constexpr bool UsesCursor() const noexcept { return menuFlags.all(Flag::kUsesMenuContext); } - [[nodiscard]] constexpr bool UsesMenuContext() const noexcept { return menuFlags.all(Flag::kUsesMovementToDirection); } - [[nodiscard]] constexpr bool UsesMovementToDirection() const noexcept { return menuFlags.all(Flag::kUpdateUsesCursor); } + [[nodiscard]] constexpr bool UpdateUsesCursor() const noexcept { return menuFlags.all(Flag::kUpdateUsesCursor); } + [[nodiscard]] constexpr bool UsesBlurredBackground() const noexcept { return menuFlags.all(Flag::kUsesBlurredBackground); } + [[nodiscard]] constexpr bool UsesCursor() const noexcept { return menuFlags.all(Flag::kUsesCursor); } + [[nodiscard]] constexpr bool UsesMenuContext() const noexcept { return menuFlags.all(Flag::kUsesMenuContext); } + [[nodiscard]] constexpr bool UsesMovementToDirection() const noexcept { return menuFlags.all(Flag::kUsesMovementToDirection); } // members GPtr uiMovie{ nullptr }; // 10 From b0f9ec59798241b309c3ac15f947c0a7d20963c0 Mon Sep 17 00:00:00 2001 From: AtomCrafty Date: Sun, 30 Jun 2024 13:24:50 +0200 Subject: [PATCH 2/2] Fix compiler error --- include/RE/N/NiBillboardNode.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/RE/N/NiBillboardNode.h b/include/RE/N/NiBillboardNode.h index c34207c00..7353d9459 100644 --- a/include/RE/N/NiBillboardNode.h +++ b/include/RE/N/NiBillboardNode.h @@ -47,7 +47,7 @@ namespace RE void SetMode(FaceMode a_mode) { - userFlags = (std::to_underlying(a_mode) << FACE_MODE_POS) | userFlags & ~FACE_MODE_MASK; + userFlags = static_cast((std::to_underlying(a_mode) << FACE_MODE_POS) | userFlags & ~FACE_MODE_MASK); } // members