From 72f25db5de537b726b892b3d439d790d040dce39 Mon Sep 17 00:00:00 2001 From: FlenarnTemp <68670981+FlenarnTemp@users.noreply.github.com> Date: Sun, 19 May 2024 14:02:45 +0200 Subject: [PATCH 1/2] feat: Update IDs. (#7) --- .../RE/Bethesda/BGSStoryManagerTreeForm.h | 4 ++-- CommonLibF4/include/RE/Bethesda/BSHavok.h | 2 +- .../include/RE/Bethesda/BSPointerHandle.h | 4 ++-- .../include/RE/Bethesda/TESObjectREFRs.h | 6 +++--- .../include/RE/Scaleform/GFx/GFx_Player.h | 18 +++++++++--------- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/CommonLibF4/include/RE/Bethesda/BGSStoryManagerTreeForm.h b/CommonLibF4/include/RE/Bethesda/BGSStoryManagerTreeForm.h index 0d53f54b..df446d7f 100644 --- a/CommonLibF4/include/RE/Bethesda/BGSStoryManagerTreeForm.h +++ b/CommonLibF4/include/RE/Bethesda/BGSStoryManagerTreeForm.h @@ -129,11 +129,11 @@ namespace RE struct ListObjectivesAccess; struct ListStagesAccess; - bool SetStage(std::uint16_t stage) + bool SetStage(std::uint16_t a_stage) { using func_t = decltype(&TESQuest::SetStage); REL::Relocation func{ REL::ID(2207743) }; - return func(this, stage); + return func(this, a_stage); } BSPointerHandle* GetAliasedRef(BSPointerHandle* a_result, std::uint32_t a_aiAliasID) diff --git a/CommonLibF4/include/RE/Bethesda/BSHavok.h b/CommonLibF4/include/RE/Bethesda/BSHavok.h index d161a9f6..3d9dbab3 100644 --- a/CommonLibF4/include/RE/Bethesda/BSHavok.h +++ b/CommonLibF4/include/RE/Bethesda/BSHavok.h @@ -21,7 +21,7 @@ namespace RE static bool RemoveObjects(NiAVObject* a_object, bool a_recurse, bool a_force) { using func_t = decltype(&RemoveObjects); - REL::Relocation func{ REL::ID(1514984) }; + REL::Relocation func{ REL::ID(2277721) }; return func(a_object, a_recurse, a_force); } diff --git a/CommonLibF4/include/RE/Bethesda/BSPointerHandle.h b/CommonLibF4/include/RE/Bethesda/BSPointerHandle.h index 6ffc347c..b612d438 100644 --- a/CommonLibF4/include/RE/Bethesda/BSPointerHandle.h +++ b/CommonLibF4/include/RE/Bethesda/BSPointerHandle.h @@ -161,7 +161,7 @@ namespace RE static BSPointerHandle CreateHandle(T* a_ptr) { using func_t = decltype(&BSPointerHandleManagerInterface::CreateHandle); - REL::Relocation func{ REL::ID(224532) }; + REL::Relocation func{ REL::ID(2188375) }; return func(a_ptr); } @@ -175,7 +175,7 @@ namespace RE static bool GetSmartPointer(const BSPointerHandle& a_handle, NiPointer& a_smartPointerOut) { using func_t = decltype(&BSPointerHandleManagerInterface::GetSmartPointer); - REL::Relocation func{ REL::ID(967277) }; + REL::Relocation func{ REL::ID(2188369) }; return func(a_handle, a_smartPointerOut); } }; diff --git a/CommonLibF4/include/RE/Bethesda/TESObjectREFRs.h b/CommonLibF4/include/RE/Bethesda/TESObjectREFRs.h index dec69a43..85835e3b 100644 --- a/CommonLibF4/include/RE/Bethesda/TESObjectREFRs.h +++ b/CommonLibF4/include/RE/Bethesda/TESObjectREFRs.h @@ -673,7 +673,7 @@ namespace RE void AddKeyword(BGSKeyword* kwd) { using func_t = decltype(&TESObjectREFR::AddKeyword); - REL::Relocation func{ REL::ID(640674) }; + REL::Relocation func{ REL::ID(2200860) }; return func(this, kwd); } @@ -734,14 +734,14 @@ namespace RE [[nodiscard]] BGSLocation* GetCurrentLocation() const { using func_t = decltype(&TESObjectREFR::GetCurrentLocation); - REL::Relocation func{ REL::ID(1135470) }; + REL::Relocation func{ REL::ID(2201163) }; return func(this); } [[nodiscard]] const char* GetDisplayFullName() { using func_t = decltype(&TESObjectREFR::GetDisplayFullName); - REL::Relocation func{ REL::ID(1212056) }; + REL::Relocation func{ REL::ID(2201126) }; return func(this); } diff --git a/CommonLibF4/include/RE/Scaleform/GFx/GFx_Player.h b/CommonLibF4/include/RE/Scaleform/GFx/GFx_Player.h index 1168c00d..86eaf4ba 100644 --- a/CommonLibF4/include/RE/Scaleform/GFx/GFx_Player.h +++ b/CommonLibF4/include/RE/Scaleform/GFx/GFx_Player.h @@ -312,14 +312,14 @@ namespace RE::Scaleform::GFx void ObjectAddRef(Value* a_val, void* a_obj) { using func_t = decltype(&ObjectInterface::ObjectRelease); - REL::Relocation func{ REL::ID(244786) }; + REL::Relocation func{ REL::ID(2286228) }; return func(this, a_val, a_obj); } void ObjectRelease(Value* a_val, void* a_obj) { using func_t = decltype(&ObjectInterface::ObjectRelease); - REL::Relocation func{ REL::ID(856221) }; + REL::Relocation func{ REL::ID(2286229) }; return func(this, a_val, a_obj); } @@ -333,35 +333,35 @@ namespace RE::Scaleform::GFx std::uint32_t GetArraySize(void* a_data) const { using func_t = decltype(&ObjectInterface::GetArraySize); - REL::Relocation func{ REL::ID(254218) }; + REL::Relocation func{ REL::ID(2285791) }; return func(this, a_data); } bool GetMember(void* a_data, const char* a_name, Value* a_val, bool a_isdobj) const { using func_t = decltype(&ObjectInterface::GetMember); - REL::Relocation func{ REL::ID(1517430) }; + REL::Relocation func{ REL::ID(2285936) }; return func(this, a_data, a_name, a_val, a_isdobj); } bool SetMember(void* a_data, const char* a_name, const Value& a_value, bool a_isdobj) { using func_t = decltype(&ObjectInterface::SetMember); - REL::Relocation func{ REL::ID(1360149) }; + REL::Relocation func{ REL::ID(2286589) }; return func(this, a_data, a_name, a_value, a_isdobj); } bool Invoke(void* a_data, Value* a_result, const char* a_name, const Value* a_args, std::size_t a_numArgs, bool a_isdobj) { using func_t = decltype(&ObjectInterface::Invoke); - REL::Relocation func{ REL::ID(655847) }; + REL::Relocation func{ REL::ID(2286101) }; return func(this, a_data, a_result, a_name, a_args, a_numArgs, a_isdobj); } bool PushBack(void* a_data, const Value& a_value) { using func_t = decltype(&ObjectInterface::PushBack); - REL::Relocation func{ REL::ID(1330475) }; + REL::Relocation func{ REL::ID(2286424) }; return func(this, a_data, a_value); } @@ -375,7 +375,7 @@ namespace RE::Scaleform::GFx void VisitMembers(void* a_data, ObjVisitor* a_visitor, bool a_isDObj) const { using func_t = decltype(&ObjectInterface::VisitMembers); - REL::Relocation func{ REL::ID(1276961) }; + REL::Relocation func{ REL::ID(2286786) }; return func(this, a_data, a_visitor, a_isDObj); } @@ -956,7 +956,7 @@ namespace RE::Scaleform::GFx void Release() { using func_t = decltype(&Movie::Release); - REL::Relocation func{ REL::ID(404814) }; + REL::Relocation func{ REL::ID(2287230) }; return func(this); } From 66a938bbed5db71f534b073b931f0db7d42350bb Mon Sep 17 00:00:00 2001 From: FlenarnTemp <68670981+FlenarnTemp@users.noreply.github.com> Date: Mon, 27 May 2024 08:07:30 +0200 Subject: [PATCH 2/2] More IDs. (#8) --- CommonLibF4/include/RE/Bethesda/Actor.h | 64 +++++++++++-------- .../include/RE/Bethesda/BGSEntryPoint.h | 2 +- .../RE/Bethesda/BGSInventoryInterface.h | 4 +- .../include/RE/Bethesda/BGSInventoryItem.h | 8 +-- .../include/RE/Bethesda/BSTempEffect.h | 2 +- .../include/RE/Bethesda/BSTextureSet.h | 2 +- CommonLibF4/include/RE/Bethesda/BSTimer.h | 4 +- CommonLibF4/include/RE/Bethesda/Calendar.h | 2 +- CommonLibF4/include/RE/Bethesda/GameScript.h | 6 +- CommonLibF4/include/RE/Bethesda/IMenu.h | 18 +++--- .../include/RE/Bethesda/ImageSpaceEffect.h | 6 +- .../include/RE/Bethesda/ImageSpaceManager.h | 2 +- .../include/RE/Bethesda/TESBoundObjects.h | 37 +++++++---- .../include/RE/Scaleform/GFx/GFx_Player.h | 2 +- 14 files changed, 90 insertions(+), 69 deletions(-) diff --git a/CommonLibF4/include/RE/Bethesda/Actor.h b/CommonLibF4/include/RE/Bethesda/Actor.h index ae0361fc..91528251 100644 --- a/CommonLibF4/include/RE/Bethesda/Actor.h +++ b/CommonLibF4/include/RE/Bethesda/Actor.h @@ -491,28 +491,28 @@ namespace RE [[nodiscard]] TESAmmo* GetCurrentAmmo(BGSEquipIndex a_equipIndex) const { using func_t = decltype(&AIProcess::GetCurrentAmmo); - REL::Relocation func{ REL::ID(1154936) }; + REL::Relocation func{ REL::ID(2232300) }; return func(this, a_equipIndex); } COMMAND_TYPE GetCommandType() { using func_t = decltype(&AIProcess::GetCommandType); - REL::Relocation func{ REL::ID(678523) }; + REL::Relocation func{ REL::ID(2231825) }; return func(this); } [[nodiscard]] ObjectRefHandle GetOccupiedFurniture() { using func_t = decltype(&AIProcess::GetOccupiedFurniture); - REL::Relocation func{ REL::ID(1162965) }; + REL::Relocation func{ REL::ID(2232401) }; return func(this); } bool IsWeaponSubgraphFinishedLoading(const Actor& a_actor) { using func_t = decltype(&AIProcess::IsWeaponSubgraphFinishedLoading); - REL::Relocation func{ REL::ID(320183) }; + REL::Relocation func{ REL::ID(2231757) }; return func(this, a_actor); } @@ -531,7 +531,7 @@ namespace RE bool ProcessGreet(Actor* a_actor, DIALOGUE_TYPE a_type, DIALOGUE_SUBTYPE a_subType, TESObjectREFR* a_target, BGSDialogueBranch* a_branch, bool a_forceSub, bool a_stop, bool a_que, bool a_sayCallback) { using func_t = decltype(&AIProcess::ProcessGreet); - REL::Relocation func{ REL::ID(1174935) }; + REL::Relocation func{ REL::ID(2231808) }; return func(this, a_actor, a_type, a_subType, a_target, a_branch, a_forceSub, a_stop, a_que, a_sayCallback); } @@ -545,14 +545,14 @@ namespace RE void SetActorsDetectionEvent(Actor* a_actor, const NiPoint3& a_location, std::int32_t a_soundLevel, TESObjectREFR* a_refr) { using func_t = decltype(&AIProcess::SetActorsDetectionEvent); - REL::Relocation func{ REL::ID(1376336) }; + REL::Relocation func{ REL::ID(2231738) }; return func(this, a_actor, a_location, a_soundLevel, a_refr); } void SetCurrentAmmo(BGSEquipIndex a_equipIndex, TESAmmo* a_ammo) { using func_t = decltype(&AIProcess::SetCurrentAmmo); - REL::Relocation func{ REL::ID(795983) }; + REL::Relocation func{ REL::ID(2232302) }; return func(this, a_equipIndex, a_ammo); } @@ -580,14 +580,14 @@ namespace RE bool SetWeaponBonesCulled(const Actor& a_actor, bool a_stateToSet, WEAPON_CULL_TYPE a_weaponCullType) { using func_t = decltype(&AIProcess::SetWeaponBonesCulled); - REL::Relocation func{ REL::ID(397172) }; + REL::Relocation func{ REL::ID(2232535) }; return func(this, a_actor, a_stateToSet, a_weaponCullType); } void StopCurrentIdle(Actor* a_actor, bool a_instant, bool a_killFlavor) { using func_t = decltype(&AIProcess::StopCurrentIdle); - REL::Relocation func{ REL::ID(434460) }; + REL::Relocation func{ REL::ID(2231705) }; return func(this, a_actor, a_instant, a_killFlavor); } @@ -853,6 +853,16 @@ namespace RE kUnderwater = 1 << 31, }; + enum class DETECTION_PRIORITY + { + kNone = 0, + kVeryLow = 1, + kLow = 2, + kNormal = 3, + kHigh = 4, + kCritical = 5, + }; + // add virtual void PlayPickUpSound(TESBoundObject* a_boundObj, bool a_pickUp, bool a_use); // 0C6 virtual float GetHeading() const { return data.angle.z; } // 0C7 @@ -974,21 +984,21 @@ namespace RE bool CanUseIdle(TESIdleForm* a_idle) const { using func_t = decltype(&Actor::CanUseIdle); - REL::Relocation func{ REL::ID(1223707) }; + REL::Relocation func{ REL::ID(2229592) }; return func(this, a_idle); } void ClearAttackStates() { using func_t = decltype(&Actor::ClearAttackStates); - REL::Relocation func{ REL::ID(1525555) }; + REL::Relocation func{ REL::ID(2229773) }; return func(this); } void EndInterruptPackage(bool a_notRunOnceDialogue) { using func_t = decltype(&Actor::EndInterruptPackage); - REL::Relocation func{ REL::ID(575188) }; + REL::Relocation func{ REL::ID(2229892) }; return func(this, a_notRunOnceDialogue); } @@ -1023,7 +1033,7 @@ namespace RE TESCombatStyle* GetCombatStyle() { using func_t = decltype(&Actor::GetCombatStyle); - REL::Relocation func{ REL::ID(1270929) }; + REL::Relocation func{ REL::ID(2231053) }; return func(this); } @@ -1049,28 +1059,28 @@ namespace RE float GetDesiredSpeed() { using func_t = decltype(&Actor::GetDesiredSpeed); - REL::Relocation func{ REL::ID(106892) }; + REL::Relocation func{ REL::ID(2230410) }; return func(this); } [[nodiscard]] bool GetHostileToActor(Actor* a_actor) { using func_t = decltype(&Actor::GetHostileToActor); - REL::Relocation func{ REL::ID(1148686) }; + REL::Relocation func{ REL::ID(2229968) }; return func(this, a_actor); } [[nodiscard]] ActorHandle GetMountHandle() { using func_t = decltype(&Actor::GetMountHandle); - REL::Relocation func{ REL::ID(313362) }; + REL::Relocation func{ REL::ID(2231230) }; return func(this); } [[nodiscard]] std::int16_t GetLevel() { using func_t = decltype(&Actor::GetLevel); - REL::Relocation func{ REL::ID(661617) }; + REL::Relocation func{ REL::ID(2229734) }; return func(this); } @@ -1079,28 +1089,28 @@ namespace RE [[nodiscard]] std::uint8_t GetPerkRank(BGSPerk* a_perk) { using func_t = decltype(&Actor::GetPerkRank); - REL::Relocation func{ REL::ID(1368313) }; + REL::Relocation func{ REL::ID(2230125) }; return func(this, a_perk); } void HandleDefaultAnimationSwitch() { using func_t = decltype(&Actor::HandleDefaultAnimationSwitch); - REL::Relocation func{ REL::ID(1163130) }; + REL::Relocation func{ REL::ID(2229780) }; return func(this); } void HandleItemEquip(bool bCullBone) { using func_t = decltype(&Actor::HandleItemEquip); - REL::Relocation func{ REL::ID(164912) }; + REL::Relocation func{ REL::ID(2229781) }; return func(this, bCullBone); } void InitiateDoNothingPackage() { using func_t = decltype(&Actor::InitiateDoNothingPackage); - REL::Relocation func{ REL::ID(89993) }; + REL::Relocation func{ REL::ID(2229807) }; return func(this); } @@ -1198,21 +1208,21 @@ namespace RE void SetGunState(GUN_STATE a_gunState, bool a_val = true) { using func_t = decltype(&Actor::SetGunState); - REL::Relocation func{ REL::ID(977675) }; + REL::Relocation func{ REL::ID(2231175) }; return func(this, a_gunState, a_val); } void SetHeading(float a_angle) { using func_t = decltype(&Actor::SetHeading); - REL::Relocation func{ REL::ID(353571) }; + REL::Relocation func{ REL::ID(2229625) }; return func(this, a_angle); } void TrespassAlarm(TESObjectREFR* a_refr, TESForm* a_owner, std::int32_t a_crime) { using func_t = decltype(&Actor::TrespassAlarm); - REL::Relocation func{ REL::ID(1109888) }; + REL::Relocation func{ REL::ID(2229834) }; return func(this, a_refr, a_owner, a_crime); } @@ -1280,7 +1290,7 @@ namespace RE public: [[nodiscard]] static ActorEquipManager* GetSingleton() { - REL::Relocation singleton{ REL::ID(1174340) }; + REL::Relocation singleton{ REL::ID(2690994) }; return *singleton; } @@ -1297,7 +1307,7 @@ namespace RE bool a_locked) { using func_t = decltype(&ActorEquipManager::EquipObject); - REL::Relocation func{ REL::ID(988029) }; + REL::Relocation func{ REL::ID(2231392) }; return func(this, a_actor, a_object, a_stackID, a_number, a_slot, a_queueEquip, a_forceEquip, a_playSounds, a_applyNow, a_locked); } @@ -1314,7 +1324,7 @@ namespace RE const BGSEquipSlot* a_slotBeingReplaced) { using func_t = decltype(&ActorEquipManager::UnequipObject); - REL::Relocation func{ REL::ID(1292493) }; + REL::Relocation func{ REL::ID(2231395) }; return func(this, a_actor, a_object, a_number, a_slot, a_stackID, a_queueEquip, a_forceEquip, a_playSounds, a_applyNow, a_slotBeingReplaced); } }; diff --git a/CommonLibF4/include/RE/Bethesda/BGSEntryPoint.h b/CommonLibF4/include/RE/Bethesda/BGSEntryPoint.h index 99465ea0..7d588ab6 100644 --- a/CommonLibF4/include/RE/Bethesda/BGSEntryPoint.h +++ b/CommonLibF4/include/RE/Bethesda/BGSEntryPoint.h @@ -172,7 +172,7 @@ namespace RE inline void HandleEntryPoint(ENTRY_POINT a_entryPoint, Actor* a_perkOwner, Args... a_args) { using func_t = decltype(&BGSEntryPoint::HandleEntryPoint); - REL::Relocation func{ REL::ID(714336) }; + REL::Relocation func{ REL::ID(2206243) }; return func(a_entryPoint, a_perkOwner, a_args...); } } diff --git a/CommonLibF4/include/RE/Bethesda/BGSInventoryInterface.h b/CommonLibF4/include/RE/Bethesda/BGSInventoryInterface.h index dd3c5ddf..6c846ad4 100644 --- a/CommonLibF4/include/RE/Bethesda/BGSInventoryInterface.h +++ b/CommonLibF4/include/RE/Bethesda/BGSInventoryInterface.h @@ -62,14 +62,14 @@ namespace RE [[nodiscard]] static BGSInventoryInterface* GetSingleton() { - REL::Relocation singleton{ REL::ID(501899) }; + REL::Relocation singleton{ REL::ID(2689299) }; return *singleton; } [[nodiscard]] const BGSInventoryItem* RequestInventoryItem(const std::uint32_t& a_handleID) const { using func_t = decltype(&BGSInventoryInterface::RequestInventoryItem); - REL::Relocation func{ REL::ID(1200959) }; + REL::Relocation func{ REL::ID(2194009) }; return func(this, a_handleID); } diff --git a/CommonLibF4/include/RE/Bethesda/BGSInventoryItem.h b/CommonLibF4/include/RE/Bethesda/BGSInventoryItem.h index bc6ee780..b4b92f6e 100644 --- a/CommonLibF4/include/RE/Bethesda/BGSInventoryItem.h +++ b/CommonLibF4/include/RE/Bethesda/BGSInventoryItem.h @@ -148,21 +148,21 @@ namespace RE [[nodiscard]] const char* GetDisplayFullName(std::uint32_t a_stackID) { using func_t = decltype(&BGSInventoryItem::GetDisplayFullName); - REL::Relocation func{ REL::ID(277641) }; + REL::Relocation func{ REL::ID(2194079) }; return func(this, a_stackID); } [[nodiscard]] TBO_InstanceData* GetInstanceData(std::uint32_t a_stackID) { using func_t = decltype(&BGSInventoryItem::GetInstanceData); - REL::Relocation func{ REL::ID(491493) }; + REL::Relocation func{ REL::ID(2194072) }; return func(this, a_stackID); } [[nodiscard]] std::int32_t GetInventoryValue(std::uint32_t a_stackID, bool a_scale) const { using func_t = decltype(&BGSInventoryItem::GetInventoryValue); - REL::Relocation func{ REL::ID(430292) }; + REL::Relocation func{ REL::ID(2194099) }; return func(this, a_stackID, a_scale); } @@ -183,7 +183,7 @@ namespace RE virtual void WriteDataImpl(TESBoundObject& a_baseObj, BGSInventoryItem::Stack& a_stack) override // 01 { using func_t = decltype(&ApplyChangesFunctor::WriteDataImpl); - REL::Relocation func{ REL::ID(1291190) }; + REL::Relocation func{ REL::ID(2223194) }; return func(this, a_baseObj, a_stack); } diff --git a/CommonLibF4/include/RE/Bethesda/BSTempEffect.h b/CommonLibF4/include/RE/Bethesda/BSTempEffect.h index d8a53f2b..73c9de4c 100644 --- a/CommonLibF4/include/RE/Bethesda/BSTempEffect.h +++ b/CommonLibF4/include/RE/Bethesda/BSTempEffect.h @@ -309,7 +309,7 @@ namespace RE bool isFirstPerson) { using func_t = BSTempEffectDebris* (*)(BSTempEffectDebris*, TESObjectCELL*, float, const char*, TESObjectREFR*, const NiPoint3&, const NiMatrix3&, const NiPoint3&, const NiPoint3&, float, bool, bool, bool); - REL::Relocation func{ REL::ID(1075623) }; + REL::Relocation func{ REL::ID(2212059) }; func(this, a_parentCell, a_lifetime, a_fileName, a_sourceRef, a_position, a_rotation, a_startLinearVelocity, a_startAngularVelocity, a_scale, a_useCache, a_addDebrisCount, isFirstPerson); } diff --git a/CommonLibF4/include/RE/Bethesda/BSTextureSet.h b/CommonLibF4/include/RE/Bethesda/BSTextureSet.h index 9647194d..67640448 100644 --- a/CommonLibF4/include/RE/Bethesda/BSTextureSet.h +++ b/CommonLibF4/include/RE/Bethesda/BSTextureSet.h @@ -37,7 +37,7 @@ namespace RE static BSShaderTextureSet* CreateObject() { using func_t = decltype(&BSShaderTextureSet::CreateObject); - REL::Relocation func{ REL::ID(993063) }; + REL::Relocation func{ REL::ID(2316324) }; return func(); } diff --git a/CommonLibF4/include/RE/Bethesda/BSTimer.h b/CommonLibF4/include/RE/Bethesda/BSTimer.h index ba64fc32..13743bd6 100644 --- a/CommonLibF4/include/RE/Bethesda/BSTimer.h +++ b/CommonLibF4/include/RE/Bethesda/BSTimer.h @@ -7,7 +7,7 @@ namespace RE public: [[nodiscard]] static BSTimer GetSingleton() { - REL::Relocation singleton{ REL::ID(1256126) }; + REL::Relocation singleton{ REL::ID(2703179) }; return *singleton; } @@ -26,7 +26,7 @@ namespace RE void SetGlobalTimeMultiplier(float a_mult, bool a_now) { using func_t = decltype(&BSTimer::SetGlobalTimeMultiplier); - REL::Relocation func{ REL::ID(1419977) }; + REL::Relocation func{ REL::ID(2267970) }; return func(this, a_mult, a_now); } diff --git a/CommonLibF4/include/RE/Bethesda/Calendar.h b/CommonLibF4/include/RE/Bethesda/Calendar.h index a336052c..e2799f0b 100644 --- a/CommonLibF4/include/RE/Bethesda/Calendar.h +++ b/CommonLibF4/include/RE/Bethesda/Calendar.h @@ -33,7 +33,7 @@ namespace RE [[nodiscard]] static Calendar* GetSingleton() { - REL::Relocation singleton{ REL::ID(1444952) }; + REL::Relocation singleton{ REL::ID(2689092) }; return *singleton; } diff --git a/CommonLibF4/include/RE/Bethesda/GameScript.h b/CommonLibF4/include/RE/Bethesda/GameScript.h index 46b9f76e..c0ec289b 100644 --- a/CommonLibF4/include/RE/Bethesda/GameScript.h +++ b/CommonLibF4/include/RE/Bethesda/GameScript.h @@ -146,7 +146,7 @@ namespace RE BSScript::ErrorLogger::Severity a_severity = BSScript::ErrorLogger::Severity::kError) { using func_t = decltype(&LogFormError); - REL::Relocation func{ REL::ID(1081933) }; + REL::Relocation func{ REL::ID(2251028) }; return func(a_obj, a_error, a_vm, a_stackID, a_severity); } @@ -266,7 +266,7 @@ namespace RE void GetInventoryObjFromHandle(std::uint64_t a_cobj, TESObjectREFR*& a_container, std::uint16_t& a_uniqueID, TESObjectREFR*& a_inWorldREFR) { using func_t = decltype(&HandlePolicy::GetInventoryObjFromHandle); - REL::Relocation func{ REL::ID(66597) }; + REL::Relocation func{ REL::ID(2249989) }; return func(this, a_cobj, a_container, a_uniqueID, a_inWorldREFR); } @@ -503,7 +503,7 @@ namespace RE bool QueuePostRenderCall(const BSTSmartPointer& a_functor) { using func_t = decltype(&GameVM::QueuePostRenderCall); - REL::Relocation func{ REL::ID(34412) }; + REL::Relocation func{ REL::ID(2251314) }; return func(this, a_functor); } diff --git a/CommonLibF4/include/RE/Bethesda/IMenu.h b/CommonLibF4/include/RE/Bethesda/IMenu.h index b0a88924..9cd01c0b 100644 --- a/CommonLibF4/include/RE/Bethesda/IMenu.h +++ b/CommonLibF4/include/RE/Bethesda/IMenu.h @@ -488,7 +488,7 @@ namespace RE Scaleform::GFx::Value* AcquireFlashObjectByMemberName(const Scaleform::GFx::Value& a_flashObject, const char* a_relativePathToMember) { using func_t = decltype(&BSGFxObject::AcquireFlashObjectByMemberName); - REL::Relocation func{ REL::ID(1172680) }; + REL::Relocation func{ REL::ID(2287014) }; return func(this, a_flashObject, a_relativePathToMember); } @@ -545,7 +545,7 @@ namespace RE void RemoveChild(const BSGFxDisplayObject& a_child) const { using func_t = decltype(&BSGFxDisplayObject::RemoveChild); - REL::Relocation func{ REL::ID(1229383) }; + REL::Relocation func{ REL::ID(2287327) }; return func(this, a_child); } @@ -622,14 +622,14 @@ namespace RE virtual void AppendShaderFXInfos(BSTArray& a_colorFXInfo, BSTArray& a_backgroundFXInfo) // 02 { using func_t = decltype(&BSGFxShaderFXTarget::AppendShaderFXInfos); - REL::Relocation func{ REL::ID(544646) }; + REL::Relocation func{ REL::ID(2287021) }; return func(this, a_colorFXInfo, a_backgroundFXInfo); } void CreateAndSetFiltersToColor(const NiColor& a_color, float a_brightness) { using func_t = void (BSGFxShaderFXTarget::*)(const NiColor&, float); - REL::Relocation func{ REL::ID(1487925) }; + REL::Relocation func{ REL::ID(2287028) }; func(this, a_color, a_brightness); } @@ -643,14 +643,14 @@ namespace RE void CreateAndSetFiltersToHUD(HUDColorTypes a_colorType, float a_scale = 1.0) { using func_t = decltype(&BSGFxShaderFXTarget::CreateAndSetFiltersToHUD); - REL::Relocation func{ REL::ID(876001) }; + REL::Relocation func{ REL::ID(2287027) }; func(this, a_colorType, a_scale); } void EnableShadedBackground(HUDColorTypes a_colorType, float a_scale = 1.0) { using func_t = decltype(&BSGFxShaderFXTarget::EnableShadedBackground); - REL::Relocation func{ REL::ID(278402) }; + REL::Relocation func{ REL::ID(2287022) }; func(this, a_colorType, a_scale); } @@ -815,13 +815,13 @@ namespace RE static void ExecuteCommand(const char* a_command) { using func_t = decltype(&Console::ExecuteCommand); - REL::Relocation func{ REL::ID(1061864) }; + REL::Relocation func{ REL::ID(2248537) }; return func(a_command); } [[nodiscard]] static decltype(auto) GetCurrentPickIndex() { - REL::Relocation currentPickIndex{ REL::ID(1407033) }; + REL::Relocation currentPickIndex{ REL::ID(2701382) }; return *currentPickIndex; } @@ -849,7 +849,7 @@ namespace RE void SetCurrentPickREFR(stl::not_null a_refr) { using func_t = decltype(&Console::SetCurrentPickREFR); - REL::Relocation func{ REL::ID(79066) }; + REL::Relocation func{ REL::ID(2248551) }; return func(this, a_refr); } diff --git a/CommonLibF4/include/RE/Bethesda/ImageSpaceEffect.h b/CommonLibF4/include/RE/Bethesda/ImageSpaceEffect.h index 43cd8727..babc97c9 100644 --- a/CommonLibF4/include/RE/Bethesda/ImageSpaceEffect.h +++ b/CommonLibF4/include/RE/Bethesda/ImageSpaceEffect.h @@ -117,7 +117,7 @@ namespace RE virtual bool IsActive() override; // 08 virtual bool UpdateParams(ImageSpaceEffectParam* a_param) override; // 09 - inline static REL::Relocation bDisable{ REL::ID(372489) }; + inline static REL::Relocation bDisable{ REL::ID(2713225) }; // members ImageSpaceTexture buffer[3]; // B0 @@ -141,7 +141,7 @@ namespace RE virtual bool IsActive() override; // 08 virtual bool UpdateParams(ImageSpaceEffectParam* a_param) override; // 09 - inline static REL::Relocation bDisable{ REL::ID(1523708) }; + inline static REL::Relocation bDisable{ REL::ID(2713237) }; // members float* data; // B0 @@ -201,7 +201,7 @@ namespace RE virtual bool IsActive() override; // 08 virtual bool UpdateParams(ImageSpaceEffectParam* a_param) override; // 09 - inline static REL::Relocation bDisable{ REL::ID(1500590) }; + inline static REL::Relocation bDisable{ REL::ID(2713225) }; }; static_assert(sizeof(ImageSpaceEffectRadialBlur) == 0xB0); diff --git a/CommonLibF4/include/RE/Bethesda/ImageSpaceManager.h b/CommonLibF4/include/RE/Bethesda/ImageSpaceManager.h index 2758b375..3ab8f038 100644 --- a/CommonLibF4/include/RE/Bethesda/ImageSpaceManager.h +++ b/CommonLibF4/include/RE/Bethesda/ImageSpaceManager.h @@ -271,7 +271,7 @@ namespace RE [[nodiscard]] static ImageSpaceManager* GetSingleton() { - REL::Relocation singleton{ REL::ID(161743) }; + REL::Relocation singleton{ REL::ID(2712627) }; return *singleton; } diff --git a/CommonLibF4/include/RE/Bethesda/TESBoundObjects.h b/CommonLibF4/include/RE/Bethesda/TESBoundObjects.h index 2b6f6b68..2cc4c23d 100644 --- a/CommonLibF4/include/RE/Bethesda/TESBoundObjects.h +++ b/CommonLibF4/include/RE/Bethesda/TESBoundObjects.h @@ -896,20 +896,31 @@ namespace RE struct BGSHazardData { public: + enum class BGSHazardFlags + { + kNone = 0, + kPlayerOnly = 1 << 0, + kInheritDuration = 1 << 1, + kAlignToNormal = 1 << 2, + kInheritRadius = 1 << 3, + kDropToGround = 1 << 4, + kTaperEffectiveness = 1 << 5, + }; + // members - std::uint32_t limit; // 00 - float radius; // 04 - float lifetime; // 08 - float imageSpaceRadius; // 0C - float targetInterval; // 10 - std::uint32_t flags; // 14 - MagicItem* spell; // 18 - TESObjectLIGH* light; // 20 - BGSImpactDataSet* impactDataSet; // 28 - BGSSoundDescriptorForm* sound; // 30 - float fullEffectRadius; // 38 - float taperWeight; // 3C - float taperCurve; // 40 + std::uint32_t limit; // 00 + float radius; // 04 + float lifetime; // 08 + float imageSpaceRadius; // 0C + float targetInterval; // 10 + stl::enumeration flags; // 14 + SpellItem* spell; // 18 + TESObjectLIGH* light; // 20 + BGSImpactDataSet* impactDataSet; // 28 + BGSSoundDescriptorForm* sound; // 30 + float fullEffectRadius; // 38 + float taperWeight; // 3C + float taperCurve; // 40 }; static_assert(sizeof(BGSHazardData) == 0x48); diff --git a/CommonLibF4/include/RE/Scaleform/GFx/GFx_Player.h b/CommonLibF4/include/RE/Scaleform/GFx/GFx_Player.h index 86eaf4ba..cc02d397 100644 --- a/CommonLibF4/include/RE/Scaleform/GFx/GFx_Player.h +++ b/CommonLibF4/include/RE/Scaleform/GFx/GFx_Player.h @@ -368,7 +368,7 @@ namespace RE::Scaleform::GFx bool RemoveElements(void* a_data, std::uint32_t a_idx, std::int32_t a_count) { using func_t = decltype(&ObjectInterface::RemoveElements); - REL::Relocation func{ REL::ID(1286586) }; + REL::Relocation func{ REL::ID(2286475) }; return func(this, a_data, a_idx, a_count); }