From dae0e27bcbf8a152247ccb7a90f4563a98ccaddd Mon Sep 17 00:00:00 2001 From: FlenarnTemp <68670981+FlenarnTemp@users.noreply.github.com> Date: Tue, 30 Jul 2024 15:39:06 +0200 Subject: [PATCH] oopsies (#17) * chore: Cleanup enum declaration. * fix: Class override incorrect. * fix: Declarations. --- CommonLibF4/include/RE/Bethesda/Events.h | 2 ++ .../include/RE/Bethesda/PipboyDataManager.h | 1 + CommonLibF4/include/RE/Bethesda/VATS.h | 20 +++++++++---------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/CommonLibF4/include/RE/Bethesda/Events.h b/CommonLibF4/include/RE/Bethesda/Events.h index 50fbf569..e9f1f764 100644 --- a/CommonLibF4/include/RE/Bethesda/Events.h +++ b/CommonLibF4/include/RE/Bethesda/Events.h @@ -1,5 +1,6 @@ #pragma once +#include "RE/Bethesda/Actor.h" #include "RE/Bethesda/BSFixedString.h" #include "RE/Bethesda/BSPointerHandle.h" #include "RE/Bethesda/BSTArray.h" @@ -12,6 +13,7 @@ namespace RE { + class ActiveEffect; class bhkNPCollisionObject; class BGSMessage; class HUDModeType; diff --git a/CommonLibF4/include/RE/Bethesda/PipboyDataManager.h b/CommonLibF4/include/RE/Bethesda/PipboyDataManager.h index 5864f6cf..05ccdc8a 100644 --- a/CommonLibF4/include/RE/Bethesda/PipboyDataManager.h +++ b/CommonLibF4/include/RE/Bethesda/PipboyDataManager.h @@ -11,6 +11,7 @@ #include "RE/Bethesda/PipboyQuestData.h" #include "RE/Bethesda/PipboyRadioData.h" #include "RE/Bethesda/PipboySpecialData.h" +#include "RE/Bethesda/PipboyStatsData.h" #include "RE/Bethesda/PipboyThrottleManager.h" #include "RE/Bethesda/PipboyValue.h" #include "RE/Bethesda/PipboyWorkshopData.h" diff --git a/CommonLibF4/include/RE/Bethesda/VATS.h b/CommonLibF4/include/RE/Bethesda/VATS.h index 09ab1bc4..b3cd65fc 100644 --- a/CommonLibF4/include/RE/Bethesda/VATS.h +++ b/CommonLibF4/include/RE/Bethesda/VATS.h @@ -21,16 +21,6 @@ namespace RE class TESHitEvent; struct WeaponFiredEvent; - namespace VATSEvents - { - struct ModeChange - { - VATS::VATS_MODE_ENUM oldMode; // 00 - VATS::VATS_MODE_ENUM newMode; // 04 - }; - static_assert(sizeof(ModeChange) == 0x8); - } - class __declspec(novtable) VATS : public BSTEventSink, // 00 public BSTEventSink, // 08 @@ -92,4 +82,14 @@ namespace RE BSSpinLock spinLock; // D0 }; static_assert(sizeof(VATS) == 0xD8); + + namespace VATSEvents + { + struct ModeChange + { + VATS::VATS_MODE_ENUM oldMode; // 00 + VATS::VATS_MODE_ENUM newMode; // 04 + }; + static_assert(sizeof(ModeChange) == 0x8); + } }