diff --git a/CommonLibF4/include/RE/Bethesda/BGSDefaultObjectManager.h b/CommonLibF4/include/RE/Bethesda/BGSDefaultObjectManager.h index 6f2f8b2f..eeeaba23 100644 --- a/CommonLibF4/include/RE/Bethesda/BGSDefaultObjectManager.h +++ b/CommonLibF4/include/RE/Bethesda/BGSDefaultObjectManager.h @@ -421,7 +421,7 @@ namespace RE public: // members const char* name; // 00 - REX::EnumSet type; // 08 + REX::EnumSet type; // 08 std::uint32_t uniqueID; // 0C REX::EnumSet doType; // 10 const char* newObjectName; // 18 @@ -500,9 +500,9 @@ namespace RE } // members - TESForm* form; // 20 - ENUM_FORM_ID type; // 28 - BSFixedString formEditorID; // 30 + TESForm* form; // 20 + ENUM_FORM_ID type; // 28 + BSFixedString formEditorID; // 30 private: BGSDefaultObject* ctor(const char* a_name, ENUM_FORM_ID a_formType, const char* a_description) diff --git a/CommonLibF4/include/RE/Bethesda/BGSInventoryItem.h b/CommonLibF4/include/RE/Bethesda/BGSInventoryItem.h index d4abccd9..5f613dea 100644 --- a/CommonLibF4/include/RE/Bethesda/BGSInventoryItem.h +++ b/CommonLibF4/include/RE/Bethesda/BGSInventoryItem.h @@ -81,7 +81,7 @@ namespace RE static_assert(sizeof(CheckStackIDFunctor) == 0x10); class alignas(0x08) CheckExtraDataFunctor : - public StackDataCompareFunctor // 00 + public StackDataCompareFunctor // 00 { public: static constexpr auto RTTI{ RTTI::BGSInventoryItem__CheckExtraDataFunctor }; @@ -95,7 +95,7 @@ namespace RE bool CompareData(const BGSInventoryItem::Stack&) override { return this->extra == extra; } // members - const ExtraDataList* extra; // 08 + const ExtraDataList* extra; // 08 }; static_assert(sizeof(CheckExtraDataFunctor) == 0x10); @@ -147,7 +147,7 @@ namespace RE static_assert(sizeof(ModifyModDataFunctor) == 0x30); class __declspec(novtable) SetHealthFunctor : - public StackDataWriteFunctor // 00 + public StackDataWriteFunctor // 00 { public: static constexpr auto RTTI{ RTTI::BGSInventoryItem__SetHealthFunctor }; @@ -160,10 +160,10 @@ namespace RE } // override (StackDataWriteFunctor) - void WriteDataImpl(TESBoundObject&, BGSInventoryItem::Stack&) override; // 01 + void WriteDataImpl(TESBoundObject&, BGSInventoryItem::Stack&) override; // 01 // members - float health; // 10 + float health; // 10 }; static_assert(sizeof(SetHealthFunctor) == 0x18); diff --git a/CommonLibF4/include/RE/Bethesda/BGSMod.h b/CommonLibF4/include/RE/Bethesda/BGSMod.h index 9c4499bf..8115d8e4 100644 --- a/CommonLibF4/include/RE/Bethesda/BGSMod.h +++ b/CommonLibF4/include/RE/Bethesda/BGSMod.h @@ -195,7 +195,7 @@ namespace RE::BGSMod BGSAttachParentArray attachParents; // 98 BGSTypedKeywordValueArray filterKeywords; // B0 BGSTypedKeywordValue attachPoint; // C0 - REX::EnumSet targetFormType; // C2 + REX::EnumSet targetFormType; // C2 std::uint8_t maxRank; // C3 std::uint8_t lvlsPerTierScaledOffset; // C4 std::int8_t priority; // C5 diff --git a/CommonLibF4/include/RE/Bethesda/BGSSceneAction.h b/CommonLibF4/include/RE/Bethesda/BGSSceneAction.h index 05ae5809..30328b6a 100644 --- a/CommonLibF4/include/RE/Bethesda/BGSSceneAction.h +++ b/CommonLibF4/include/RE/Bethesda/BGSSceneAction.h @@ -39,7 +39,7 @@ namespace RE kNeutral = 0x2, kQuestion = 0x3, kTotal = 0x4, - kNone =0x5 + kNone = 0x5 }; enum SCENE_ACTION_TYPE : std::uint32_t @@ -80,7 +80,7 @@ namespace RE virtual void InitItem(void); // 02 virtual void OnDelete(void); // 03 virtual void ClearData(void); // 04 - virtual void Copy(void); // 05 + virtual void Copy(void); // 05 virtual bool QIsLooping(void); // 06 virtual bool QFaceHeadTrackTarget(const BGSScene* scene); // 07 virtual SCENE_ACTION_TYPE GetActionType() const = 0; // 08 @@ -154,11 +154,11 @@ namespace RE 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 - std::uint32_t playerInput; // E0 + std::uint64_t dialogueTarget; // 90 + TESTopic* pNPCResponseTopics[4]; // 98 + BGSKeyword* pNPCResponseSubtypeKeywords[4]; // B8 + TESTopic* pTopic; // D8 + std::uint32_t playerInput; // E0 TESTopicInfo* GetCurrentTopicInfo(BGSScene* a_parentScene, TESObjectREFR* a_target, std::uint32_t a_type) { diff --git a/CommonLibF4/include/RE/Bethesda/BSExtraData.h b/CommonLibF4/include/RE/Bethesda/BSExtraData.h index c5185d9d..f296e8c6 100644 --- a/CommonLibF4/include/RE/Bethesda/BSExtraData.h +++ b/CommonLibF4/include/RE/Bethesda/BSExtraData.h @@ -473,13 +473,13 @@ namespace RE kPowerArmorLocation = 0x58, kDogmeat = 0x59, kTeammate = 0x5A, - + kCountTotal = 0x5B }; - std::uint8_t flags; // 10 - std::uint8_t originalFlags; // 11 - MARKER_TYPE type; // 12 + std::uint8_t flags; // 10 + std::uint8_t originalFlags; // 11 + MARKER_TYPE type; // 12 }; static_assert(sizeof(MapMarkerData) == 0x18); @@ -1116,7 +1116,7 @@ namespace RE // members BaseExtraList extraData; // 08 - mutable BSReadWriteLock extraRWLock; // 20 + mutable BSReadWriteLock extraRWLock; // 20 }; static_assert(sizeof(ExtraDataList) == 0x28); } diff --git a/CommonLibF4/include/RE/Bethesda/ControlMap.h b/CommonLibF4/include/RE/Bethesda/ControlMap.h index 1e407222..3d4630c8 100644 --- a/CommonLibF4/include/RE/Bethesda/ControlMap.h +++ b/CommonLibF4/include/RE/Bethesda/ControlMap.h @@ -10,7 +10,7 @@ namespace RE { enum class PC_GAMEPAD_TYPE { - kDirectX = 0x0, + kDirectX = 0x0, kOrbis = 0x1, kTotal diff --git a/CommonLibF4/include/RE/Bethesda/Events.h b/CommonLibF4/include/RE/Bethesda/Events.h index bc13a964..ec9f916d 100644 --- a/CommonLibF4/include/RE/Bethesda/Events.h +++ b/CommonLibF4/include/RE/Bethesda/Events.h @@ -48,8 +48,8 @@ namespace RE { // members REX::EnumSet changeType; // 00 - const BGSObjectInstance* itemAffected; // 08 - Actor* actorAffected; // 10 + const BGSObjectInstance* itemAffected; // 08 + Actor* actorAffected; // 10 std::uint32_t stackID; // 18 }; static_assert(sizeof(Event) == 0x20); @@ -65,17 +65,17 @@ namespace RE struct PerkValueChangedEvent { - Type changeType; // 00 - BSPointerHandle> owner; // 04 - BGSPerk* perk; // 08 - std::uint8_t rank; // 10 + Type changeType; // 00 + BSPointerHandle> owner; // 04 + BGSPerk* perk; // 08 + std::uint8_t rank; // 10 }; static_assert(sizeof(PerkValueChangedEvent) == 0x18); struct PerkEntryUpdatedEvent { - BSPointerHandle> owner; // 00 - BGSPerkEntry* perkEntry; // 08 + BSPointerHandle> owner; // 00 + BGSPerkEntry* perkEntry; // 08 }; static_assert(sizeof(PerkEntryUpdatedEvent) == 0x10); } @@ -93,16 +93,16 @@ namespace RE struct Event { - PlayerCharacterQuestEvent::Type changeType; // 00 - BGSInstancedQuestObjective* questObjective; // 08 + PlayerCharacterQuestEvent::Type changeType; // 00 + BGSInstancedQuestObjective* questObjective; // 08 }; static_assert(sizeof(Event) == 0x10); } struct TESTrackedStatsEvent { - BSFixedString stat; // 00 - std::int32_t value; // 08 + BSFixedString stat; // 00 + std::int32_t value; // 08 }; static_assert(sizeof(TESTrackedStatsEvent) == 0x10); @@ -118,15 +118,15 @@ namespace RE struct Event { - TESQuestEvent::Type changeType; // 00 - TESQuest* quest; // 08 + TESQuestEvent::Type changeType; // 00 + TESQuest* quest; // 08 }; static_assert(sizeof(Event) == 0x10); } struct TESLocationClearedEvent { - const BGSLocation* loc; //00 + const BGSLocation* loc; //00 }; static_assert(sizeof(TESLocationClearedEvent) == 0x8); @@ -134,7 +134,7 @@ namespace RE { struct Event { - ACTOR_LIFE_STATE lifeState; // 00 + ACTOR_LIFE_STATE lifeState; // 00 }; static_assert(sizeof(Event) == 0x4); } @@ -150,8 +150,8 @@ namespace RE struct Event { - BSTSmartPointer effect; // 00 - PlayerActiveEffectChanged::Status status; // 08 + BSTSmartPointer effect; // 00 + PlayerActiveEffectChanged::Status status; // 08 }; } @@ -169,21 +169,20 @@ namespace RE [[nodiscard]] static BSTEventSource* GetEventSource() { using func_t = decltype(&Event::GetEventSource); - static REL::Relocation func{ REL::ID(349120) }; // .163 + static REL::Relocation func{ REL::ID(349120) }; // .163 return func(); } - std::uint32_t newLevel; // 00 + std::uint32_t newLevel; // 00 }; static_assert(sizeof(Event) == 0x4); } - namespace LoadingStatusChanged { struct Event { - bool isLoading; // 00 + bool isLoading; // 00 }; static_assert(sizeof(Event) == 0x1); } @@ -192,8 +191,8 @@ namespace RE { struct Event { - const TESBoundObject* item; // 00 - const Actor* equipper; // 08 + const TESBoundObject* item; // 00 + const Actor* equipper; // 08 }; static_assert(sizeof(Event) == 0x10); } @@ -202,7 +201,7 @@ namespace RE { struct Event { - bool isPlayerInDialogue; // 00 + bool isPlayerInDialogue; // 00 }; static_assert(sizeof(Event) == 0x1); } @@ -211,7 +210,7 @@ namespace RE { struct Event { - bool shouldClearMapMarkers; // 00 + bool shouldClearMapMarkers; // 00 }; static_assert(sizeof(Event) == 0x1); } @@ -220,7 +219,7 @@ namespace RE { // intentional struct Event - {}; + {}; } namespace HolotapeStateChanged { @@ -244,8 +243,8 @@ namespace RE { struct Event { - BSPointerHandle> owner; // 00 - InventoryInterface::Handle* item; // 04 + BSPointerHandle> owner; // 00 + InventoryInterface::Handle* item; // 04 }; } @@ -253,8 +252,8 @@ namespace RE { struct ComponentFavoriteEvent { - BGSComponent* component; // 00 - bool isFavorited; // 08 + BGSComponent* component; // 00 + bool isFavorited; // 08 }; static_assert(sizeof(ComponentFavoriteEvent) == 0x10); } @@ -263,8 +262,8 @@ namespace RE { struct Event { - std::uint32_t oldDifficulty; // 00 - std::uint32_t newDifficulty; // 04 + std::uint32_t oldDifficulty; // 00 + std::uint32_t newDifficulty; // 04 }; static_assert(sizeof(Event) == 0x8); } @@ -273,10 +272,10 @@ namespace RE { struct Event { - BSPointerHandle> markerRef; // 00 - MapMarkerData* data; // 08 - std::uint32_t selectedMarkerIndex; // 10 - bool discovered; // 14 + BSPointerHandle> markerRef; // 00 + MapMarkerData* data; // 08 + std::uint32_t selectedMarkerIndex; // 10 + bool discovered; // 14 }; static_assert(sizeof(Event) == 0x18); } @@ -285,7 +284,7 @@ namespace RE { public: // member - ActorHandle actor; // 00 + ActorHandle actor; // 00 }; static_assert(sizeof(BGSActorEvent) == 0x4); @@ -504,7 +503,7 @@ namespace RE } // members - const BSTArray* currentHUDModes; // 00 + const BSTArray* currentHUDModes; // 00 }; static_assert(sizeof(HUDModeEvent) == 0x8); @@ -716,11 +715,11 @@ namespace RE { public: // members - BSFixedString SwfName; // 00 - const BGSSoundDescriptorForm* soundForm; // 08 - bool VATSCritAppliedAnim; // 10 - bool VATSCritFillenAnim; // 11 - bool dialogueSpeechChallengeAnim; // 12 + BSFixedString SwfName; // 00 + const BGSSoundDescriptorForm* soundForm; // 08 + bool VATSCritAppliedAnim; // 10 + bool VATSCritFillenAnim; // 11 + bool dialogueSpeechChallengeAnim; // 12 }; static_assert(sizeof(HUDPerkVaultBoyData) == 0x18); @@ -1041,9 +1040,9 @@ namespace RE } // members - const TESBoundObject* itemHarvested; // 00 - TESObjectREFR* referenceHarvested; // 08 - const Actor* harvestedBy; // 10 + const TESBoundObject* itemHarvested; // 00 + TESObjectREFR* referenceHarvested; // 08 + const Actor* harvestedBy; // 10 }; static_assert(sizeof(ItemHarvested) == 0x18); }; @@ -1096,8 +1095,8 @@ namespace RE }; // members - EVENT_TYPE type; // 00 - bool NoLoadScreen; // 04 + EVENT_TYPE type; // 00 + bool NoLoadScreen; // 04 }; static_assert(sizeof(PositionPlayerEvent) == 0x8); diff --git a/CommonLibF4/include/RE/Bethesda/IMenu.h b/CommonLibF4/include/RE/Bethesda/IMenu.h index bf75f707..3f1aa027 100644 --- a/CommonLibF4/include/RE/Bethesda/IMenu.h +++ b/CommonLibF4/include/RE/Bethesda/IMenu.h @@ -1947,9 +1947,8 @@ namespace RE F4_HEAP_REDEFINE_NEW(InitDataRepairFailure); // members - const BSTArray>* requiredItems; // 20 - BSTHashMap availableComponents; // 28 - + const BSTArray>* requiredItems; // 20 + BSTHashMap availableComponents; // 28 }; static_assert(sizeof(InitDataRepairFailure) == 0x58); diff --git a/CommonLibF4/include/RE/Bethesda/PipboyArray.h b/CommonLibF4/include/RE/Bethesda/PipboyArray.h index 16977e96..d1cb07a1 100644 --- a/CommonLibF4/include/RE/Bethesda/PipboyArray.h +++ b/CommonLibF4/include/RE/Bethesda/PipboyArray.h @@ -5,17 +5,17 @@ namespace RE { class PipboyArray : - public PipboyValue // 00 + public PipboyValue // 00 { public: static constexpr auto RTTI{ RTTI::PipboyArray }; static constexpr auto VTABLE{ VTABLE::PipboyArray }; // members - BSTArray elements; // 18 - BSTSet addedElementIDs; // 30 - BSTArray removedElementIDs; // 60 - bool newlyCreated; // 78 + BSTArray elements; // 18 + BSTSet addedElementIDs; // 30 + BSTArray removedElementIDs; // 60 + bool newlyCreated; // 78 }; static_assert(sizeof(PipboyArray) == 0x80); } diff --git a/CommonLibF4/include/RE/Bethesda/PipboyDataGroup.h b/CommonLibF4/include/RE/Bethesda/PipboyDataGroup.h index 15e4bf0d..8b2467f3 100644 --- a/CommonLibF4/include/RE/Bethesda/PipboyDataGroup.h +++ b/CommonLibF4/include/RE/Bethesda/PipboyDataGroup.h @@ -2,8 +2,8 @@ #include "RE/Bethesda/BSTEvent.h" #include "RE/Bethesda/IMenu.h" -#include "RE/Bethesda/PipboyValue.h" #include "RE/Bethesda/PipboyThrottleManager.h" +#include "RE/Bethesda/PipboyValue.h" namespace RE { diff --git a/CommonLibF4/include/RE/Bethesda/PipboyDataManager.h b/CommonLibF4/include/RE/Bethesda/PipboyDataManager.h index dd07327e..7caab82c 100644 --- a/CommonLibF4/include/RE/Bethesda/PipboyDataManager.h +++ b/CommonLibF4/include/RE/Bethesda/PipboyDataManager.h @@ -20,7 +20,7 @@ namespace RE { class _declspec(novtable) PipboyDataManager : - public BSTSingletonSDM // 00 + public BSTSingletonSDM // 00 { public: [[nodiscard]] static PipboyDataManager* GetSingleton() @@ -30,20 +30,20 @@ namespace RE } // members - PipboyObject rootObject; // 08 - PipboyStatsData statsData; // A0 - PipboySpecialData specialData; // 1D8 - PipboyPerksData perksData; // 280 - PipboyInventoryData inventoryData; // 358 - PipboyQuestData questData; // 4F0 - PipboyWorkshopData workshopData; // 5D8 - PipboyLogData logData; // 718 - PipboyMapData mapData; // 7F0 - PipboyRadioData radioData; // A28 - PipboyPlayerInfoData playerInfoData; // AD8 - PipboyStatusData statusData; // BE0 - PipboyDataGroup* dataGroups[11]; // CC0 - PipboyThrottleManager throttleManager; // D18 + PipboyObject rootObject; // 08 + PipboyStatsData statsData; // A0 + PipboySpecialData specialData; // 1D8 + PipboyPerksData perksData; // 280 + PipboyInventoryData inventoryData; // 358 + PipboyQuestData questData; // 4F0 + PipboyWorkshopData workshopData; // 5D8 + PipboyLogData logData; // 718 + PipboyMapData mapData; // 7F0 + PipboyRadioData radioData; // A28 + PipboyPlayerInfoData playerInfoData; // AD8 + PipboyStatusData statusData; // BE0 + PipboyDataGroup* dataGroups[11]; // CC0 + PipboyThrottleManager throttleManager; // D18 }; static_assert(sizeof(PipboyDataManager) == 0xD48); } diff --git a/CommonLibF4/include/RE/Bethesda/PipboyInventoryData.h b/CommonLibF4/include/RE/Bethesda/PipboyInventoryData.h index e71088e1..abfb4a6f 100644 --- a/CommonLibF4/include/RE/Bethesda/PipboyInventoryData.h +++ b/CommonLibF4/include/RE/Bethesda/PipboyInventoryData.h @@ -11,17 +11,17 @@ namespace RE { class PipboyInventoryData : - public PipboyDataGroup, // 00 - public BSTEventSink, // 98 - public BSTEventSink, // A0 - public BSTEventSink, // A8 - public BSTEventSink, // B0 - public BSTEventSink, // B8 - public BSTEventSink, // C0 - public BSTEventSink, // C8 - public BSTEventSink, // D0 - public BSTEventSink, // D8 - public BSTEventSink // E0 + public PipboyDataGroup, // 00 + public BSTEventSink, // 98 + public BSTEventSink, // A0 + public BSTEventSink, // A8 + public BSTEventSink, // B0 + public BSTEventSink, // B8 + public BSTEventSink, // C0 + public BSTEventSink, // C8 + public BSTEventSink, // D0 + public BSTEventSink, // D8 + public BSTEventSink // E0 { public: static constexpr auto RTTI{ RTTI::PipboyInventoryData }; @@ -49,14 +49,14 @@ namespace RE struct StackEntry { - PipboyObject* linkedObject; // 00 - const InventoryInterface::Handle inventoryHandle; // 08 + PipboyObject* linkedObject; // 00 + const InventoryInterface::Handle inventoryHandle; // 08 }; static_assert(sizeof(StackEntry) == 0x10); struct ItemEntry { - void* stackEntries; // 00 - BSTList + void* stackEntries; // 00 - BSTList }; static_assert(sizeof(ItemEntry) == 0x8); @@ -64,20 +64,20 @@ namespace RE virtual BSEventNotifyControl ProcessEvent(const PipboyValueChangedEvent& a_event, BSTEventSource* a_source); // 01 // add - virtual BSEventNotifyControl ProcessEvent(const BGSInventoryListEvent::Event& a_event, BSTEventSource* a_source); // 02 - virtual BSEventNotifyControl ProcessEvent(const ActorEquipManagerEvent::Event& a_event, BSTEventSource* a_source); // 03 - virtual BSEventNotifyControl ProcessEvent(const ActorValueEvents::ActorValueChangedEvent& a_event, BSTEventSource* a_source); // 04 - virtual BSEventNotifyControl ProcessEvent(const PerkValueEvents::PerkEntryUpdatedEvent& a_event, BSTEventSource* a_source); // 05 - virtual BSEventNotifyControl ProcessEvent(const PerkValueEvents::PerkValueChangedEvent& a_event, BSTEventSource* a_source); // 06 - virtual BSEventNotifyControl ProcessEvent(const InventoryInterface::FavoriteChangedEvent& a_event, BSTEventSource* a_source); // 07 - virtual BSEventNotifyControl ProcessEvent(const HolotapeStateChanged::Event& a_event, BSTEventSource* a_source); // 08 - virtual BSEventNotifyControl ProcessEvent(const BGSInventoryItemEvent::Event& a_event, BSTEventSource* a_source); // 09 - virtual BSEventNotifyControl ProcessEvent(const FavoriteMgr_Events::ComponentFavoriteEvent& a_event, BSTEventSource* a_source); // 0A - virtual BSEventNotifyControl ProcessEvent(const PlayerDifficultySettingChanged::Event& a_event, BSTEventSource* a_source); // 0B + virtual BSEventNotifyControl ProcessEvent(const BGSInventoryListEvent::Event& a_event, BSTEventSource* a_source); // 02 + virtual BSEventNotifyControl ProcessEvent(const ActorEquipManagerEvent::Event& a_event, BSTEventSource* a_source); // 03 + virtual BSEventNotifyControl ProcessEvent(const ActorValueEvents::ActorValueChangedEvent& a_event, BSTEventSource* a_source); // 04 + virtual BSEventNotifyControl ProcessEvent(const PerkValueEvents::PerkEntryUpdatedEvent& a_event, BSTEventSource* a_source); // 05 + virtual BSEventNotifyControl ProcessEvent(const PerkValueEvents::PerkValueChangedEvent& a_event, BSTEventSource* a_source); // 06 + virtual BSEventNotifyControl ProcessEvent(const InventoryInterface::FavoriteChangedEvent& a_event, BSTEventSource* a_source); // 07 + virtual BSEventNotifyControl ProcessEvent(const HolotapeStateChanged::Event& a_event, BSTEventSource* a_source); // 08 + virtual BSEventNotifyControl ProcessEvent(const BGSInventoryItemEvent::Event& a_event, BSTEventSource* a_source); // 09 + virtual BSEventNotifyControl ProcessEvent(const FavoriteMgr_Events::ComponentFavoriteEvent& a_event, BSTEventSource* a_source); // 0A + virtual BSEventNotifyControl ProcessEvent(const PlayerDifficultySettingChanged::Event& a_event, BSTEventSource* a_source); // 0B - virtual void Populate(bool a_arg1); // 0C - virtual void DoClearData(); // 0D - virtual void DoClearSink(); // 0E + virtual void Populate(bool a_arg1); // 0C + virtual void DoClearData(); // 0D + virtual void DoClearSink(); // 0E void RepopulateItemCardsOnSection(ENUM_FORM_ID itemTypeID) { @@ -87,11 +87,11 @@ namespace RE } // members - PipboyObject* inventoryObject; // E8 - BSTHashMap itemEntries; // F0 - BSTHashMap invComponents; // 120 - BSTArray sortedItems; // 150 - BSTSet queuedRepopulateCategories; // 168 + PipboyObject* inventoryObject; // E8 + BSTHashMap itemEntries; // F0 + BSTHashMap invComponents; // 120 + BSTArray sortedItems; // 150 + BSTSet queuedRepopulateCategories; // 168 }; static_assert(sizeof(PipboyInventoryData) == 0x198); } diff --git a/CommonLibF4/include/RE/Bethesda/PipboyLogData.h b/CommonLibF4/include/RE/Bethesda/PipboyLogData.h index de5e21e7..97e0a3da 100644 --- a/CommonLibF4/include/RE/Bethesda/PipboyLogData.h +++ b/CommonLibF4/include/RE/Bethesda/PipboyLogData.h @@ -6,24 +6,24 @@ namespace RE { class __declspec(novtable) PipboyLogData : - public PipboyDataGroup, // 00 - public BSTEventSink // 98 + public PipboyDataGroup, // 00 + public BSTEventSink // 98 { public: static constexpr auto RTTI{ RTTI::PipboyLogData }; static constexpr auto VTABLE{ VTABLE::PipboyLogData }; - virtual ~PipboyLogData() = default; // 00 + virtual ~PipboyLogData() = default; // 00 - virtual BSEventNotifyControl ProcessEvent(const TESTrackedStatsEvent& a_event, BSTEventSource* a_source); // 01 + virtual BSEventNotifyControl ProcessEvent(const TESTrackedStatsEvent& a_event, BSTEventSource* a_source); // 01 virtual void Populate(bool a_arg1) override; // 02 virtual void DoClearData() override; // 03 virtual void DoClearSink() override; // 04 // members - PipboyArray* statTypeArray; // A0 - BSTHashMap statMap; // A8 + PipboyArray* statTypeArray; // A0 + BSTHashMap statMap; // A8 }; static_assert(sizeof(PipboyLogData) == 0xD8); } diff --git a/CommonLibF4/include/RE/Bethesda/PipboyMapData.h b/CommonLibF4/include/RE/Bethesda/PipboyMapData.h index c8fe0eff..b07afb17 100644 --- a/CommonLibF4/include/RE/Bethesda/PipboyMapData.h +++ b/CommonLibF4/include/RE/Bethesda/PipboyMapData.h @@ -6,17 +6,17 @@ namespace RE { class __declspec(novtable) PipboyMapData : - public PipboyDataGroup, // 00 - public BSTEventSink, // 98 - public BSTEventSink, // A0 - public BSTEventSink, // A8 - public BSTEventSink, // B0 - public BSTEventSink, // B8 - public BSTEventSink, // C0 - public BSTEventSink, // C8 - public BSTEventSink, // D0 - public BSTEventSink, // D8 - public BSTEventSink // E0 + public PipboyDataGroup, // 00 + public BSTEventSink, // 98 + public BSTEventSink, // A0 + public BSTEventSink, // A8 + public BSTEventSink, // B0 + public BSTEventSink, // B8 + public BSTEventSink, // C0 + public BSTEventSink, // C8 + public BSTEventSink, // D0 + public BSTEventSink, // D8 + public BSTEventSink // E0 { public: static constexpr auto RTTI{ RTTI::PipboyMapData }; @@ -24,16 +24,16 @@ namespace RE virtual ~PipboyMapData() = default; - virtual BSEventNotifyControl ProcessEvent(const TravelMarkerStateChange::Event& a_event, BSTEventSource* a_source); // 01 - virtual BSEventNotifyControl ProcessEvent(const PlayerUpdateEvent& a_event, BSTEventSource* a_source); // 02 - virtual BSEventNotifyControl ProcessEvent(const BGSActorCellEvent& a_event, BSTEventSource* a_source); // 03 - virtual BSEventNotifyControl ProcessEvent(const TESQuestEvent::Event& a_event, BSTEventSource* a_source); // 04 - virtual BSEventNotifyControl ProcessEvent(const PlayerCharacterQuestEvent::Event& a_event, BSTEventSource* a_source); // 05 - virtual BSEventNotifyControl ProcessEvent(const CustomMarkerUpdate::Event& a_event, BSTEventSource* a_source); // 06 - virtual BSEventNotifyControl ProcessEvent(const LocationMarkerArrayUpdate::Event& a_event, BSTEventSource* a_source); // 07 - virtual BSEventNotifyControl ProcessEvent(const LocalMapCameraUpdate::Event& a_event, BSTEventSource* a_source); // 08 - virtual BSEventNotifyControl ProcessEvent(const TESLocationClearedEvent& a_event, BSTEventSource* a_source); // 09 - virtual BSEventNotifyControl ProcessEvent(const ActorValueEvents::ActorValueChangedEvent& a_event, BSTEventSource* a_source); // 0A + virtual BSEventNotifyControl ProcessEvent(const TravelMarkerStateChange::Event& a_event, BSTEventSource* a_source); // 01 + virtual BSEventNotifyControl ProcessEvent(const PlayerUpdateEvent& a_event, BSTEventSource* a_source); // 02 + virtual BSEventNotifyControl ProcessEvent(const BGSActorCellEvent& a_event, BSTEventSource* a_source); // 03 + virtual BSEventNotifyControl ProcessEvent(const TESQuestEvent::Event& a_event, BSTEventSource* a_source); // 04 + virtual BSEventNotifyControl ProcessEvent(const PlayerCharacterQuestEvent::Event& a_event, BSTEventSource* a_source); // 05 + virtual BSEventNotifyControl ProcessEvent(const CustomMarkerUpdate::Event& a_event, BSTEventSource* a_source); // 06 + virtual BSEventNotifyControl ProcessEvent(const LocationMarkerArrayUpdate::Event& a_event, BSTEventSource* a_source); // 07 + virtual BSEventNotifyControl ProcessEvent(const LocalMapCameraUpdate::Event& a_event, BSTEventSource* a_source); // 08 + virtual BSEventNotifyControl ProcessEvent(const TESLocationClearedEvent& a_event, BSTEventSource* a_source); // 09 + virtual BSEventNotifyControl ProcessEvent(const ActorValueEvents::ActorValueChangedEvent& a_event, BSTEventSource* a_source); // 0A // override virtual void Populate(bool a_arg1) override; // 0B @@ -41,23 +41,23 @@ namespace RE virtual void DoClearSink() override; // 0D // members - PipboyObject* mapObject; // E8 - BSTHashMap travelLocationsMarkers; // F0 - BSTHashMap>> travelLocationRefrHandles; // 120 - BSTArray doorMarkers; // 150 - BSTArray>> doorRefHandles; // 168 - BSTHashMap>, PipboyObject*> localQuestMarkers; // 180 - BSTHashMap>, PipboyObject*> worldQuestMarkers; // 1B0 - NiPoint3 playerLastLocationPosition; // 1E0 - NiPoint3 playerLastWorldPosition; // 1EC - PipboyObject* localPlayerMarker; // 1F8 - PipboyObject* worldPlayerMarker; // 200 - PipboyObject* localCustomMarker; // 208 - PipboyObject* worldCustomMarker; // 210 - PipboyObject* localPowerArmorMarker; // 218 - PipboyObject* worldPowerArmorMarker; // 220 - PipboyObject* worldMapExtents; // 230 - PipboyObject* localMapExtents; // 238 + PipboyObject* mapObject; // E8 + BSTHashMap travelLocationsMarkers; // F0 + BSTHashMap>> travelLocationRefrHandles; // 120 + BSTArray doorMarkers; // 150 + BSTArray>> doorRefHandles; // 168 + BSTHashMap>, PipboyObject*> localQuestMarkers; // 180 + BSTHashMap>, PipboyObject*> worldQuestMarkers; // 1B0 + NiPoint3 playerLastLocationPosition; // 1E0 + NiPoint3 playerLastWorldPosition; // 1EC + PipboyObject* localPlayerMarker; // 1F8 + PipboyObject* worldPlayerMarker; // 200 + PipboyObject* localCustomMarker; // 208 + PipboyObject* worldCustomMarker; // 210 + PipboyObject* localPowerArmorMarker; // 218 + PipboyObject* worldPowerArmorMarker; // 220 + PipboyObject* worldMapExtents; // 230 + PipboyObject* localMapExtents; // 238 }; static_assert(sizeof(PipboyMapData) == 0x238); } diff --git a/CommonLibF4/include/RE/Bethesda/PipboyPerksData.h b/CommonLibF4/include/RE/Bethesda/PipboyPerksData.h index fc48aea4..415e730c 100644 --- a/CommonLibF4/include/RE/Bethesda/PipboyPerksData.h +++ b/CommonLibF4/include/RE/Bethesda/PipboyPerksData.h @@ -6,8 +6,8 @@ namespace RE { class __declspec(novtable) PipboyPerksData : - public PipboyDataGroup, // 00 - public BSTEventSink // 98 + public PipboyDataGroup, // 00 + public BSTEventSink // 98 { public: static constexpr auto RTTI{ RTTI::PipboyPerksData }; @@ -22,9 +22,9 @@ namespace RE virtual void DoClearData() override; // 03 virtual void DoClearSink() override; // 04 - PipboyArray* perkChains; // A0 - BSTArray perkChainRoots; // A8 - BSTArray perksArray; // C0 + PipboyArray* perkChains; // A0 + BSTArray perkChainRoots; // A8 + BSTArray perksArray; // C0 }; static_assert(sizeof(PipboyPerksData) == 0xD8); } diff --git a/CommonLibF4/include/RE/Bethesda/PipboyPlayerInfoData.h b/CommonLibF4/include/RE/Bethesda/PipboyPlayerInfoData.h index b6e6a3f9..41b1a9a6 100644 --- a/CommonLibF4/include/RE/Bethesda/PipboyPlayerInfoData.h +++ b/CommonLibF4/include/RE/Bethesda/PipboyPlayerInfoData.h @@ -5,20 +5,20 @@ namespace RE { class __declspec(novtable) PipboyPlayerInfoData : - public PipboyDataGroup, // 00 - public BSTEventSink, // 98 - public BSTEventSink, // A0 - public BSTEventSink, // A8 - public BSTEventSink, // B0 - public BSTEventSink, // B8 - public BSTEventSink, // C0 - public BSTEventSink, // C8 - public BSTEventSink, // D0 - public BSTEventSink, // D8 - public BSTEventSink, // E0 - public BSTEventSink, // E8 - public BSTEventSink, // F0 - public BSTEventSink // F8 + public PipboyDataGroup, // 00 + public BSTEventSink, // 98 + public BSTEventSink, // A0 + public BSTEventSink, // A8 + public BSTEventSink, // B0 + public BSTEventSink, // B8 + public BSTEventSink, // C0 + public BSTEventSink, // C8 + public BSTEventSink, // D0 + public BSTEventSink, // D8 + public BSTEventSink, // E0 + public BSTEventSink, // E8 + public BSTEventSink, // F0 + public BSTEventSink // F8 { public: static constexpr auto RTTI{ RTTI::PipboyPlayerInfoData }; @@ -26,19 +26,19 @@ namespace RE virtual ~PipboyPlayerInfoData() = default; - virtual BSEventNotifyControl ProcessEvent(const ActorValueEvents::ActorValueChangedEvent& a_event, BSTEventSource* a_source); // 01 - virtual BSEventNotifyControl ProcessEvent(const BGSInventoryListEvent::Event& a_event, BSTEventSource* a_source); // 02 - virtual BSEventNotifyControl ProcessEvent(const ActorEquipManagerEvent::Event& a_event, BSTEventSource* a_source); // 03 - virtual BSEventNotifyControl ProcessEvent(const LevelIncrease::Event& a_event, BSTEventSource* a_source); // 04 - virtual BSEventNotifyControl ProcessEvent(const PerkPointIncreaseEvent& a_event, BSTEventSource* a_source); // 05 - virtual BSEventNotifyControl ProcessEvent(const PerkValueEvents::PerkEntryUpdatedEvent& a_event, BSTEventSource* a_source); // 06 - virtual BSEventNotifyControl ProcessEvent(const HourPassed::Event& a_event, BSTEventSource* a_source); // 07 - virtual BSEventNotifyControl ProcessEvent(const SPECIALMenuEvent::NameChangedEvent& a_event, BSTEventSource* a_source); // 08 - virtual BSEventNotifyControl ProcessEvent(const PlayerUpdateEvent& a_event, BSTEventSource* a_source); // 09 - virtual BSEventNotifyControl ProcessEvent(const BGSInventoryItemEvent::Event& a_event, BSTEventSource* a_source); // 0A - virtual BSEventNotifyControl ProcessEvent(const PlayerActiveEffectChanged::Event& a_event, BSTEventSource* a_source); // 0B - virtual BSEventNotifyControl ProcessEvent(const PlayerCharacterQuestEvent::Event& a_event, BSTEventSource* a_source); // 0C - virtual BSEventNotifyControl ProcessEvent(const PlayerDifficultySettingChanged::Event& a_event, BSTEventSource* a_source); // 0D + virtual BSEventNotifyControl ProcessEvent(const ActorValueEvents::ActorValueChangedEvent& a_event, BSTEventSource* a_source); // 01 + virtual BSEventNotifyControl ProcessEvent(const BGSInventoryListEvent::Event& a_event, BSTEventSource* a_source); // 02 + virtual BSEventNotifyControl ProcessEvent(const ActorEquipManagerEvent::Event& a_event, BSTEventSource* a_source); // 03 + virtual BSEventNotifyControl ProcessEvent(const LevelIncrease::Event& a_event, BSTEventSource* a_source); // 04 + virtual BSEventNotifyControl ProcessEvent(const PerkPointIncreaseEvent& a_event, BSTEventSource* a_source); // 05 + virtual BSEventNotifyControl ProcessEvent(const PerkValueEvents::PerkEntryUpdatedEvent& a_event, BSTEventSource* a_source); // 06 + virtual BSEventNotifyControl ProcessEvent(const HourPassed::Event& a_event, BSTEventSource* a_source); // 07 + virtual BSEventNotifyControl ProcessEvent(const SPECIALMenuEvent::NameChangedEvent& a_event, BSTEventSource* a_source); // 08 + virtual BSEventNotifyControl ProcessEvent(const PlayerUpdateEvent& a_event, BSTEventSource* a_source); // 09 + virtual BSEventNotifyControl ProcessEvent(const BGSInventoryItemEvent::Event& a_event, BSTEventSource* a_source); // 0A + virtual BSEventNotifyControl ProcessEvent(const PlayerActiveEffectChanged::Event& a_event, BSTEventSource* a_source); // 0B + virtual BSEventNotifyControl ProcessEvent(const PlayerCharacterQuestEvent::Event& a_event, BSTEventSource* a_source); // 0C + virtual BSEventNotifyControl ProcessEvent(const PlayerDifficultySettingChanged::Event& a_event, BSTEventSource* a_source); // 0D // override virtual void Populate(bool a_arg1) override; // 0E diff --git a/CommonLibF4/include/RE/Bethesda/PipboyPrimitiveValue.h b/CommonLibF4/include/RE/Bethesda/PipboyPrimitiveValue.h index eb13ccbb..ed25f104 100644 --- a/CommonLibF4/include/RE/Bethesda/PipboyPrimitiveValue.h +++ b/CommonLibF4/include/RE/Bethesda/PipboyPrimitiveValue.h @@ -5,23 +5,22 @@ namespace RE { template - class PipboyPrimitiveValue; // Forward declaration for specialization **only** + class PipboyPrimitiveValue; // Forward declaration for specialization **only** template <> class __declspec(novtable) PipboyPrimitiveValue : public PipboyValue { public: - virtual ~PipboyPrimitiveValue() {} // 00 + virtual ~PipboyPrimitiveValue() {} // 00 // override - virtual void CleanDirtyToGame() override {} // 00 - virtual void Serialize(Json::Value* a_json) override {} // 01 - virtual void SerializeChanges(BSBinarySerializer& a_serializer, bool a_fullSerialization) override {} // 03 - virtual SERIALIZATION_DATA_TYPE GetType() override { return SERIALIZATION_DATA_TYPE::kUint32; } - - PipboyPrimitiveValue(std::uint32_t a_value, PipboyValue* a_parentValue) - : PipboyValue(a_parentValue), value(a_value) {} + virtual void CleanDirtyToGame() override {} // 00 + virtual void Serialize(Json::Value* a_json) override {} // 01 + virtual void SerializeChanges(BSBinarySerializer& a_serializer, bool a_fullSerialization) override {} // 03 + virtual SERIALIZATION_DATA_TYPE GetType() override { return SERIALIZATION_DATA_TYPE::kUint32; } + PipboyPrimitiveValue(std::uint32_t a_value, PipboyValue* a_parentValue) : + PipboyValue(a_parentValue), value(a_value) {} void ctor(std::uint32_t a_value, PipboyValue* a_parentValue) { @@ -30,12 +29,13 @@ namespace RE func(this, a_value, a_parentValue); } - operator std::uint32_t() const { + operator std::uint32_t() const + { return value; } // members - std::uint32_t value; // 18 + std::uint32_t value; // 18 }; static_assert(sizeof(PipboyPrimitiveValue) == 0x20); @@ -43,16 +43,16 @@ namespace RE class __declspec(novtable) PipboyPrimitiveValue : public PipboyValue { public: - virtual ~PipboyPrimitiveValue() {} // 00 + virtual ~PipboyPrimitiveValue() {} // 00 // override - virtual void CleanDirtyToGame() override {} // 00 - virtual void Serialize(Json::Value* a_json) override {} // 01 - virtual void SerializeChanges(BSBinarySerializer& a_serializer, bool a_fullSerialization) override {} // 03 + virtual void CleanDirtyToGame() override {} // 00 + virtual void Serialize(Json::Value* a_json) override {} // 01 + virtual void SerializeChanges(BSBinarySerializer& a_serializer, bool a_fullSerialization) override {} // 03 virtual SERIALIZATION_DATA_TYPE GetType() override { return SERIALIZATION_DATA_TYPE::kBool; } - PipboyPrimitiveValue(bool a_value, PipboyValue* a_parentValue) - : PipboyValue(a_parentValue), value(a_value) {} + PipboyPrimitiveValue(bool a_value, PipboyValue* a_parentValue) : + PipboyValue(a_parentValue), value(a_value) {} void ctor(bool a_value, PipboyValue* a_parentValue) { @@ -61,12 +61,13 @@ namespace RE func(this, a_value, a_parentValue); } - operator bool() const { + operator bool() const + { return value; } // members - bool value; // 18 + bool value; // 18 }; static_assert(sizeof(PipboyPrimitiveValue) == 0x20); } diff --git a/CommonLibF4/include/RE/Bethesda/PipboyQuestData.h b/CommonLibF4/include/RE/Bethesda/PipboyQuestData.h index 10cc67b0..5e4cc222 100644 --- a/CommonLibF4/include/RE/Bethesda/PipboyQuestData.h +++ b/CommonLibF4/include/RE/Bethesda/PipboyQuestData.h @@ -6,9 +6,9 @@ namespace RE { class __declspec(novtable) PipboyQuestData : - public PipboyDataGroup, // 00 - public BSTEventSink, // 89 - public BSTEventSink // A0 + public PipboyDataGroup, // 00 + public BSTEventSink, // 89 + public BSTEventSink // A0 { public: static constexpr auto RTTI{ RTTI::PipboyQuestData }; @@ -16,16 +16,16 @@ namespace RE virtual ~PipboyQuestData(); - virtual BSEventNotifyControl ProcessEvent(const PlayerCharacterQuestEvent::Event& a_event, BSTEventSource* a_source); // 01 - virtual BSEventNotifyControl ProcessEvent(const TESQuestEvent::Event& a_event, BSTEventSource* a_source); // 02 + virtual BSEventNotifyControl ProcessEvent(const PlayerCharacterQuestEvent::Event& a_event, BSTEventSource* a_source); // 01 + virtual BSEventNotifyControl ProcessEvent(const TESQuestEvent::Event& a_event, BSTEventSource* a_source); // 02 - virtual void Populate(bool a_arg1) override; // 03 + virtual void Populate(bool a_arg1) override; // 03 virtual void DoClearData() override; // 04 - virtual void DoClearSink() override; // 05 + virtual void DoClearSink() override; // 05 // members - std::uint32_t sortIndex; // A8 - PipboyArray* questArray; // B0 + std::uint32_t sortIndex; // A8 + PipboyArray* questArray; // B0 //BSTHashMap, BSTArray*> objectivesByQuest; // B8 void* unk[6]; }; diff --git a/CommonLibF4/include/RE/Bethesda/PipboyRadioData.h b/CommonLibF4/include/RE/Bethesda/PipboyRadioData.h index 6993383e..97522b00 100644 --- a/CommonLibF4/include/RE/Bethesda/PipboyRadioData.h +++ b/CommonLibF4/include/RE/Bethesda/PipboyRadioData.h @@ -12,9 +12,9 @@ namespace RE } class __declspec(novtable) PipboyRadioData : - public PipboyDataGroup, // 00 - public BSTEventSink, // 98 - public BSTEventSink // A0 + public PipboyDataGroup, // 00 + public BSTEventSink, // 98 + public BSTEventSink // A0 { public: static constexpr auto RTTI{ RTTI::PipboyRadioData }; @@ -22,15 +22,15 @@ namespace RE virtual ~PipboyRadioData() = default; - virtual BSEventNotifyControl ProcessEvent(const RadioManager::PipboyFrequencyDetectionEvent& a_event, BSTEventSource* a_source); // 01 - virtual BSEventNotifyControl ProcessEvent(const RadioManager::PipboyRadioTuningEvent& a_event, BSTEventSource* a_source); // 02 + virtual BSEventNotifyControl ProcessEvent(const RadioManager::PipboyFrequencyDetectionEvent& a_event, BSTEventSource* a_source); // 01 + virtual BSEventNotifyControl ProcessEvent(const RadioManager::PipboyRadioTuningEvent& a_event, BSTEventSource* a_source); // 02 - virtual void Populate(bool a_arg1) override; // 03 - virtual void DoClearData() override; // 04 - virtual void DoClearSink() override; // 05 + virtual void Populate(bool a_arg1) override; // 03 + virtual void DoClearData() override; // 04 + virtual void DoClearSink() override; // 05 // members - PipboyArray* radioStations; // A8 + PipboyArray* radioStations; // A8 }; static_assert(sizeof(PipboyRadioData) == 0xB0); } diff --git a/CommonLibF4/include/RE/Bethesda/PipboySpecialData.h b/CommonLibF4/include/RE/Bethesda/PipboySpecialData.h index 389628d9..d6eaa21d 100644 --- a/CommonLibF4/include/RE/Bethesda/PipboySpecialData.h +++ b/CommonLibF4/include/RE/Bethesda/PipboySpecialData.h @@ -6,8 +6,8 @@ namespace RE { class __declspec(novtable) PipboySpecialData : - public PipboyDataGroup, // 00 - public BSTEventSink // 98 + public PipboyDataGroup, // 00 + public BSTEventSink // 98 { public: static constexpr auto RTTI{ RTTI::PipboySpecialData }; @@ -21,10 +21,10 @@ namespace RE virtual void DoClearSink() override; // 03 // add - virtual BSEventNotifyControl ProcessEvent(const ActorValueEvents::ActorValueChangedEvent& a_event, BSTEventSource* a_source); // 04 + virtual BSEventNotifyControl ProcessEvent(const ActorValueEvents::ActorValueChangedEvent& a_event, BSTEventSource* a_source); // 04 // members - PipboyArray* specialsArray; // A0 + PipboyArray* specialsArray; // A0 }; static_assert(sizeof(PipboySpecialData) == 0xA8); } diff --git a/CommonLibF4/include/RE/Bethesda/PipboyStatsData.h b/CommonLibF4/include/RE/Bethesda/PipboyStatsData.h index 3ad64448..856708be 100644 --- a/CommonLibF4/include/RE/Bethesda/PipboyStatsData.h +++ b/CommonLibF4/include/RE/Bethesda/PipboyStatsData.h @@ -5,16 +5,16 @@ namespace RE { struct ConditionBoyEvent - {}; + {}; class __declspec(novtable) PipboyStatsData : - public PipboyDataGroup, // 00 + public PipboyDataGroup, // 00 public BSTEventSink, // 98 - public BSTEventSink, // A0 - public BSTEventSink, // A8 - public BSTEventSink, // B0 - public BSTEventSink, // B8 - public BSTEventSink // C0 + public BSTEventSink, // A0 + public BSTEventSink, // A8 + public BSTEventSink, // B0 + public BSTEventSink, // B8 + public BSTEventSink // C0 { public: static constexpr auto RTTI{ RTTI::PipboyStatsData }; @@ -23,9 +23,9 @@ namespace RE virtual ~PipboyStatsData() = default; virtual BSEventNotifyControl ProcessEvent(const ActorValueEvents::ActorValueChangedEvent& a_event, BSTEventSource* a_source); // 01 - virtual BSEventNotifyControl ProcessEvent(const BGSInventoryListEvent::Event& a_event, BSTEventSource* a_source); // 02 + virtual BSEventNotifyControl ProcessEvent(const BGSInventoryListEvent::Event& a_event, BSTEventSource* a_source); // 02 virtual BSEventNotifyControl ProcessEvent(const PlayerActiveEffectChanged::Event& a_event, BSTEventSource* a_source); // 03 - virtual BSEventNotifyControl ProcessEvent(const ConditionBoyEvent& a_event, BSTEventSource* a_source); // 04 + virtual BSEventNotifyControl ProcessEvent(const ConditionBoyEvent& a_event, BSTEventSource* a_source); // 04 virtual BSEventNotifyControl ProcessEvent(const ActorItemEquipped::Event& a_event, BSTEventSource* a_source); // 05 virtual BSEventNotifyControl ProcessEvent(const BGSInventoryItemEvent::Event& a_event, BSTEventSource* a_source); // 06 @@ -35,10 +35,10 @@ namespace RE virtual void DoClearSink() override; // 09 // members - PipboyObject* playerStatsObject; // C8 - PipboyArray* activeEffectsArray; // D0 - BSTHashMap activeEffectsMap; // D8 - BSTHashMap, PipboyObject*> activeEffectEntriesMap; // 108 + PipboyObject* playerStatsObject; // C8 + PipboyArray* activeEffectsArray; // D0 + BSTHashMap activeEffectsMap; // D8 + BSTHashMap, PipboyObject*> activeEffectEntriesMap; // 108 }; static_assert(sizeof(PipboyStatsData) == 0x138); } diff --git a/CommonLibF4/include/RE/Bethesda/PipboyStatusData.h b/CommonLibF4/include/RE/Bethesda/PipboyStatusData.h index 74adbce9..ecfd19a2 100644 --- a/CommonLibF4/include/RE/Bethesda/PipboyStatusData.h +++ b/CommonLibF4/include/RE/Bethesda/PipboyStatusData.h @@ -6,14 +6,14 @@ namespace RE { class __declspec(novtable) PipboyStatusData : - public PipboyDataGroup, // 00 - public BSTEventSink, // 98 - public BSTEventSink, // A0 - public BSTEventSink, // A8 - public BSTEventSink, // B0 - public BSTEventSink, // B8 - public BSTEventSink, // C0 - public BSTEventSink // C8 + public PipboyDataGroup, // 00 + public BSTEventSink, // 98 + public BSTEventSink, // A0 + public BSTEventSink, // A8 + public BSTEventSink, // B0 + public BSTEventSink, // B8 + public BSTEventSink, // C0 + public BSTEventSink // C8 { public: static constexpr auto RTTI{ RTTI::PipboyStatusData }; diff --git a/CommonLibF4/include/RE/Bethesda/PipboyThrottleManager.h b/CommonLibF4/include/RE/Bethesda/PipboyThrottleManager.h index 94d3598e..85419d76 100644 --- a/CommonLibF4/include/RE/Bethesda/PipboyThrottleManager.h +++ b/CommonLibF4/include/RE/Bethesda/PipboyThrottleManager.h @@ -11,10 +11,10 @@ namespace RE static constexpr auto VTABLE{ VTABLE::IPipboyThrottledValue }; // members - virtual ~IPipboyThrottledValue(); // 00 + virtual ~IPipboyThrottledValue(); // 00 // add - void* Update(); // 01 + void* Update(); // 01 }; static_assert(sizeof(IPipboyThrottledValue) == 0x8); diff --git a/CommonLibF4/include/RE/Bethesda/PipboyWorkshopData.h b/CommonLibF4/include/RE/Bethesda/PipboyWorkshopData.h index ef5544a6..50ddaa15 100644 --- a/CommonLibF4/include/RE/Bethesda/PipboyWorkshopData.h +++ b/CommonLibF4/include/RE/Bethesda/PipboyWorkshopData.h @@ -24,10 +24,10 @@ namespace RE virtual void DoClearSink() override; // 05 // members - PipboyArray* workshopArray; // A8 - BSTHashMap workshopMap; // B0 - BSTHashMap ratingUpdateFunctions; // E0 - BSTHashMap getValueFunctions; // 110 + PipboyArray* workshopArray; // A8 + BSTHashMap workshopMap; // B0 + BSTHashMap ratingUpdateFunctions; // E0 + BSTHashMap getValueFunctions; // 110 }; static_assert(sizeof(PipboyWorkshopData) == 0x140); } diff --git a/CommonLibF4/include/RE/Bethesda/TESForms.h b/CommonLibF4/include/RE/Bethesda/TESForms.h index ad2782a4..61a4c42e 100644 --- a/CommonLibF4/include/RE/Bethesda/TESForms.h +++ b/CommonLibF4/include/RE/Bethesda/TESForms.h @@ -1802,10 +1802,10 @@ namespace RE return func(this); } - [[nodiscard]] bool IsRandom() const noexcept { return data.flags.all(TOPIC_INFO_DATA::TOPIC_INFO_FLAGS::kRandom); } - [[nodiscard]] bool IsRandomEnd() const noexcept { return data.flags.all(TOPIC_INFO_DATA::TOPIC_INFO_FLAGS::kRandomEnd); } - [[nodiscard]] bool IsSayOnce() const noexcept { return data.flags.all(TOPIC_INFO_DATA::TOPIC_INFO_FLAGS::kSayOnce); } - [[nodiscard]] bool StartSceneOnEnd() const noexcept { return data.flags.all(TOPIC_INFO_DATA::TOPIC_INFO_FLAGS::kStartSceneOnEnd); } + [[nodiscard]] bool IsRandom() const noexcept { return data.flags.all(TOPIC_INFO_DATA::TOPIC_INFO_FLAGS::kRandom); } + [[nodiscard]] bool IsRandomEnd() const noexcept { return data.flags.all(TOPIC_INFO_DATA::TOPIC_INFO_FLAGS::kRandomEnd); } + [[nodiscard]] bool IsSayOnce() const noexcept { return data.flags.all(TOPIC_INFO_DATA::TOPIC_INFO_FLAGS::kSayOnce); } + [[nodiscard]] bool StartSceneOnEnd() const noexcept { return data.flags.all(TOPIC_INFO_DATA::TOPIC_INFO_FLAGS::kStartSceneOnEnd); } // members TESTopic* parentTopic; // 20 @@ -1822,8 +1822,8 @@ namespace RE struct TOPIC_INFO_SCENEDATA { - BGSScene* scene; // 00 - std::uint32_t phase; // 08 + BGSScene* scene; // 00 + std::uint32_t phase; // 08 }; static_assert(sizeof(TOPIC_INFO_SCENEDATA) == 0x10); @@ -2946,7 +2946,7 @@ namespace RE public IKeywordFormBase // 20 { public: - enum class FLAG + enum class FLAG { kBeginOnQuestStart = 0x0, kStopQuestOnEnd = 0x1, @@ -3376,9 +3376,9 @@ namespace RE static_assert(sizeof(RuleSet) == 0x18); // members - ENUM_FORM_ID type; // 020 - RuleSet ruleSets[10]; // 028 - BSTArray mergeSources; // 118 + ENUM_FORM_ID type; // 020 + RuleSet ruleSets[10]; // 028 + BSTArray mergeSources; // 118 }; static_assert(sizeof(BGSInstanceNamingRules) == 0x130); diff --git a/CommonLibF4/include/RE/Bethesda/bhkCharacterController.h b/CommonLibF4/include/RE/Bethesda/bhkCharacterController.h index 54839134..0a4f9df7 100644 --- a/CommonLibF4/include/RE/Bethesda/bhkCharacterController.h +++ b/CommonLibF4/include/RE/Bethesda/bhkCharacterController.h @@ -41,11 +41,11 @@ namespace RE public: enum class Preset { - STATIC = 0x0, ///< No velocity allowed - DYNAMIC = 0x1, ///< For regular dynamic bodies, undamped and gravity factor = 1 - KEYFRAMED = 0x2, ///< like DYNAMIC, but gravity factor = 0 - FROZEN = 0x3, ///< like KEYFRAMED, but lots of damping - DEBRIS = 0x4, ///< like DYNAMIC, but aggressive deactivation + STATIC = 0x0, ///< No velocity allowed + DYNAMIC = 0x1, ///< For regular dynamic bodies, undamped and gravity factor = 1 + KEYFRAMED = 0x2, ///< like DYNAMIC, but gravity factor = 0 + FROZEN = 0x3, ///< like KEYFRAMED, but lots of damping + DEBRIS = 0x4, ///< like DYNAMIC, but aggressive deactivation NUM_PRESETS = 0x5 };