From 8ae1a5fc56a554fa58a7718f64a4f3d913e91c2c Mon Sep 17 00:00:00 2001 From: shad0wshayd3 Date: Wed, 8 May 2024 02:30:25 +0000 Subject: [PATCH] maintenance --- .../include/RE/Bethesda/BGSSceneAction.h | 169 +++++++++--------- CommonLibF4/include/RE/Bethesda/TESForms.h | 5 +- 2 files changed, 88 insertions(+), 86 deletions(-) diff --git a/CommonLibF4/include/RE/Bethesda/BGSSceneAction.h b/CommonLibF4/include/RE/Bethesda/BGSSceneAction.h index fde492f2..00b76e64 100644 --- a/CommonLibF4/include/RE/Bethesda/BGSSceneAction.h +++ b/CommonLibF4/include/RE/Bethesda/BGSSceneAction.h @@ -76,153 +76,154 @@ namespace RE virtual ~BGSSceneAction(); // 00 // add - virtual void Unk_01(void); // 01 - virtual void Unk_02(void); // 02 - virtual void Unk_03(void); // 03 - virtual void Unk_04(void); // 04 - virtual void Unk_05(void); // 05 - virtual bool QIsLooping(void); // 06 - virtual bool QFaceHeadTrackTarget(const BGSScene* scene); // 07 - virtual SCENE_ACTION_TYPE GetActionType() const = 0; // 08 - virtual bool QActionCanEnd(); // 09 - virtual bool IsPackageActive(BGSScene* scene, TESPackage* package, Actor* actor); // 0A - virtual void Unk_0B(void); // 0B - virtual void Unk_0C(void); // 0C - virtual void Unk_0D(void); // 0D - virtual void Unk_0E(void); // 0E - virtual void Unk_0F(void); // 0F - virtual void Unk_10(void); // 10 - virtual void Unk_11(void); // 11 - virtual void StartAction(BGSScene* scene); // 12 - virtual void EndAction(BGSScene* scene); // 13 - virtual void CleanUpActionActor(void); // 14 - virtual void UpdateAction(BGSScene* scene); // 14 + virtual void Unk_01(void); // 01 + virtual void Unk_02(void); // 02 + virtual void Unk_03(void); // 03 + virtual void Unk_04(void); // 04 + virtual void Unk_05(void); // 05 + virtual bool QIsLooping(void); // 06 + virtual bool QFaceHeadTrackTarget(const BGSScene* scene); // 07 + virtual SCENE_ACTION_TYPE GetActionType() const = 0; // 08 + virtual bool QActionCanEnd(); // 09 + virtual bool IsPackageActive(BGSScene* scene, TESPackage* package, Actor* actor); // 0A + virtual void Unk_0B(void); // 0B + virtual void Unk_0C(void); // 0C + virtual void Unk_0D(void); // 0D + virtual void Unk_0E(void); // 0E + virtual void Unk_0F(void); // 0F + virtual void Unk_10(void); // 10 + virtual void Unk_11(void); // 11 + virtual void StartAction(BGSScene* scene); // 12 + virtual void EndAction(BGSScene* scene); // 13 + virtual void CleanUpActionActor(void); // 14 + virtual void UpdateAction(BGSScene* scene); // 14 // members - std::uint32_t actorID; // 08 - std::uint16_t startPhase; // 0C - std::uint16_t endPhase; // 0E + std::uint32_t actorID; // 08 + std::uint16_t startPhase; // 0C + std::uint16_t endPhase; // 0E stl::enumeration flags; // 10 stl::enumeration status; // 14 - std::uint32_t uniqueID; // 18 + std::uint32_t uniqueID; // 18 }; static_assert(sizeof(BGSSceneAction) == 0x20); - class __declspec(novtable) BGSSceneActionDialogue : + class __declspec(novtable) BGSSceneActionDialogue : public BGSSceneAction { public: static constexpr auto RTTI{ RTTI::BGSSceneActionDialogue }; static constexpr auto VTABLE{ VTABLE::BGSSceneActionDialogue }; - // members - TESTopic* topic; // 20 - float maxLoopTime; // 28 - float minLoopTime; // 2C - BSTArray headTrackTargetA; // 30 - float currentLoopTimer; // 48 - BGSKeyword* pAnimFaceArchType; // 50 - BGSKeyword* pSubtypeKeyword; // 58 - BGSSoundOutput* outputModel; // 60 - BSTSmartPointer pInputLayer; // 68 - std::uint32_t headTargetValue; // 74 - float headTrackChangeTimer; // 78 + // members + TESTopic* topic; // 20 + float maxLoopTime; // 28 + float minLoopTime; // 2C + BSTArray headTrackTargetA; // 30 + float currentLoopTimer; // 48 + BGSKeyword* pAnimFaceArchType; // 50 + BGSKeyword* pSubtypeKeyword; // 58 + BGSSoundOutput* outputModel; // 60 + BSTSmartPointer pInputLayer; // 68 + std::uint32_t headTargetValue; // 74 + float headTrackChangeTimer; // 78 }; static_assert(sizeof(BGSSceneActionDialogue) == 0x78); - class __declspec(novtable) BGSSceneActionConversationBase : + class __declspec(novtable) BGSSceneActionConversationBase : public BGSSceneAction { - public: + public: static constexpr auto RTTI{ RTTI::BGSSceneActionConversationBase }; static constexpr auto VTABLE{ VTABLE::BGSSceneActionConversationBase }; - TESTopic* responseTopics[4]; // 20 - BGSKeyword* pResponseSubtypeKeywords[4]; // 40 - BGSSoundOutput* pOutputModel; // 60 - BSTArray headTrackTargetA; // 68 - std::uint32_t headTargetValue; // 80 - float headTrackChangeTimer; // 84 - TESTopic* currentTopic; // 88 + TESTopic* responseTopics[4]; // 20 + BGSKeyword* pResponseSubtypeKeywords[4]; // 40 + BGSSoundOutput* pOutputModel; // 60 + BSTArray headTrackTargetA; // 68 + std::uint32_t headTargetValue; // 80 + float headTrackChangeTimer; // 84 + TESTopic* currentTopic; // 88 }; static_assert(sizeof(BGSSceneActionConversationBase) == 0x90); - class __declspec(novtable) BGSSceneActionPlayerDialogue : + class __declspec(novtable) BGSSceneActionPlayerDialogue : public BGSSceneActionConversationBase { public: static constexpr auto RTTI{ RTTI::BGSSceneActionPlayerDialogue }; static constexpr auto VTABlE{ VTABLE::BGSSceneActionPlayerDialogue }; - std::uint64_t dialogueTarget; // 90 - TESTopic* pNPCResponseTopics[4]; // 98 - BGSKeyword* pNPCResponseSubtypeKeywords[4]; // B8 - TESTopic* pTopic; // D8 - SCENE_ACTION_PLAYER_RESPONSE_TYPE playerInput; // E0 + std::uint64_t dialogueTarget; // 90 + TESTopic* pNPCResponseTopics[4]; // 98 + BGSKeyword* pNPCResponseSubtypeKeywords[4]; // B8 + TESTopic* pTopic; // D8 + SCENE_ACTION_PLAYER_RESPONSE_TYPE playerInput; // E0 }; static_assert(sizeof(BGSSceneActionPlayerDialogue) == 0xE8); - class __declspec(novtable) BGSSceneActionNPCResponseDialogue : public BGSSceneActionConversationBase { }; + class __declspec(novtable) BGSSceneActionNPCResponseDialogue : public BGSSceneActionConversationBase + {}; - class __declspec(novtable) BGSSceneActionStartScene : + class __declspec(novtable) BGSSceneActionStartScene : public BGSSceneAction { - public: + public: static constexpr auto RTTI{ RTTI::BGSSceneActionStartScene }; static constexpr auto VTABlE{ VTABLE::BGSSceneActionStartScene }; - BSTArray scenesA; // 20 - BGSScene* scene; // 38 - std::uint16_t sceneStartPhase; // 40 - bool endSceneSayGreeting; // 42 + BSTArray scenesA; // 20 + BGSScene* scene; // 38 + std::uint16_t sceneStartPhase; // 40 + bool endSceneSayGreeting; // 42 }; static_assert(sizeof(BGSSceneActionStartScene) == 0x48); - class __declspec(novtable) BGSSceneActionTimer : + class __declspec(novtable) BGSSceneActionTimer : public BGSSceneAction { - public: + public: static constexpr auto RTTI{ RTTI::BGSSceneActionTimer }; static constexpr auto VTABlE{ VTABLE::BGSSceneActionTimer }; - float seconds; // 20 - float minSeconds; // 24 - float timer; // 28 - bool scriptEndRun; // 2C - bool runEnd; // 2D - float currentSeconds; // 30 + float seconds; // 20 + float minSeconds; // 24 + float timer; // 28 + bool scriptEndRun; // 2C + bool runEnd; // 2D + float currentSeconds; // 30 }; static_assert(sizeof(BGSSceneActionTimer) == 0x38); - class __declspec(novtable) BGSSceneActionRadio : + class __declspec(novtable) BGSSceneActionRadio : public BGSSceneAction { - public: + public: static constexpr auto RTTI{ RTTI::BGSSceneActionRadio }; static constexpr auto VTABlE{ VTABLE::BGSSceneActionRadio }; - TESTopic* topic; // 20 - BGSSoundDescriptorForm* sound; // 28 - BGSSoundOutput* outputModel; // 30 - BGSKeyword* subtypeKeyword; // 38 - BGSSoundDescriptorForm* topicSound; // 40 - float soundDuration; // 48 - std::uint32_t soundID; // 4C - bool soundDone; // 50 - TESTopic* currentTopic; // 58 - float failTimer; // 60 + TESTopic* topic; // 20 + BGSSoundDescriptorForm* sound; // 28 + BGSSoundOutput* outputModel; // 30 + BGSKeyword* subtypeKeyword; // 38 + BGSSoundDescriptorForm* topicSound; // 40 + float soundDuration; // 48 + std::uint32_t soundID; // 4C + bool soundDone; // 50 + TESTopic* currentTopic; // 58 + float failTimer; // 60 }; static_assert(sizeof(BGSSceneActionRadio) == 0x68); - class __declspec(novtable) BGSSceneActionPackage : + class __declspec(novtable) BGSSceneActionPackage : public BGSSceneAction { - public: + public: static constexpr auto RTTI{ RTTI::BGSSceneActionPackage }; static constexpr auto VTABlE{ VTABLE::BGSSceneActionPackage }; - std::uint32_t currentPackIndex; // 20 - BSTArray packages; // 28 + std::uint32_t currentPackIndex; // 20 + BSTArray packages; // 28 }; static_assert(sizeof(BGSSceneActionPackage) == 0x40); } diff --git a/CommonLibF4/include/RE/Bethesda/TESForms.h b/CommonLibF4/include/RE/Bethesda/TESForms.h index 859f1413..d86d13a7 100644 --- a/CommonLibF4/include/RE/Bethesda/TESForms.h +++ b/CommonLibF4/include/RE/Bethesda/TESForms.h @@ -1662,7 +1662,8 @@ namespace RE struct TOPIC_INFO_DATA { public: - enum class TOPIC_INFO_FLAGS : std::uint32_t { + enum class TOPIC_INFO_FLAGS : std::uint32_t + { kNone = 0, kStartSceneOnEnd = 0x1, kRandom = 0x2, @@ -1689,7 +1690,7 @@ namespace RE // members stl::enumeration flags; // 0 - std::uint16_t timeUntilReset; // 2 + std::uint16_t timeUntilReset; // 2 }; static_assert(sizeof(TOPIC_INFO_DATA) == 0x4);