Skip to content

Commit

Permalink
Update (#2)
Browse files Browse the repository at this point in the history
* chore: Remove type specifiers.

* feat: More misc. IDs updated.
  • Loading branch information
FlenarnTemp authored May 7, 2024
1 parent 23a6c5b commit 8c6425f
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 32 deletions.
30 changes: 15 additions & 15 deletions CommonLibF4/include/RE/Bethesda/BGSSceneAction.h
Original file line number Diff line number Diff line change
Expand Up @@ -117,16 +117,16 @@ namespace RE

// members
TESTopic* topic; // 20
float fMaxLoopTime; // 28
float fMinLoopTime; // 2C
BSTArray<std::uint32_t> iHeadTrackTargetA; // 30
float fCurrentLoopTimer; // 48
float maxLoopTime; // 28
float minLoopTime; // 2C
BSTArray<std::uint32_t> headTrackTargetA; // 30
float currentLoopTimer; // 48
BGSKeyword* pAnimFaceArchType; // 50
BGSKeyword* pSubtypeKeyword; // 58
BGSSoundOutput* outputModel; // 60
BSTSmartPointer<BSInputEnableLayer> pInputLayer; // 68
std::uint32_t iHeadTargetValue; // 74
float fHeadTrackChangeTimer; // 78
std::uint32_t headTargetValue; // 74
float headTrackChangeTimer; // 78
};
static_assert(sizeof(BGSSceneActionDialogue) == 0x78);

Expand All @@ -140,9 +140,9 @@ namespace RE
TESTopic* responseTopics[4]; // 20
BGSKeyword* pResponseSubtypeKeywords[4]; // 40
BGSSoundOutput* pOutputModel; // 60
BSTArray<std::uint32_t> iHeadTrackTargetA; // 68
std::uint32_t iHeadTargetValue; // 80
float fHeadTrackChangeTimer; // 84
BSTArray<std::uint32_t> headTrackTargetA; // 68
std::uint32_t headTargetValue; // 80
float headTrackChangeTimer; // 84
TESTopic* currentTopic; // 88
};
static_assert(sizeof(BGSSceneActionConversationBase) == 0x90);
Expand Down Expand Up @@ -185,12 +185,12 @@ namespace RE
static constexpr auto RTTI{ RTTI::BGSSceneActionTimer };
static constexpr auto VTABlE{ VTABLE::BGSSceneActionTimer };

float fSeconds; // 20
float fMinSeconds; // 24
float fTimer; // 28
float seconds; // 20
float minSeconds; // 24
float timer; // 28
bool scriptEndRun; // 2C
bool runEnd; // 2D
float fCurrentSeconds; // 30
float currentSeconds; // 30
};
static_assert(sizeof(BGSSceneActionTimer) == 0x38);

Expand All @@ -206,11 +206,11 @@ namespace RE
BGSSoundOutput* outputModel; // 30
BGSKeyword* subtypeKeyword; // 38
BGSSoundDescriptorForm* topicSound; // 40
float fSoundDuration; // 48
float soundDuration; // 48
std::uint32_t soundID; // 4C
bool soundDone; // 50
TESTopic* currentTopic; // 58
float fFailTimer; // 60
float failTimer; // 60
};
static_assert(sizeof(BGSSceneActionRadio) == 0x68);

Expand Down
2 changes: 1 addition & 1 deletion CommonLibF4/include/RE/Bethesda/PlayerCharacter.h
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ namespace RE
bool IsGodMode()
{
using func_t = decltype(&PlayerCharacter::IsGodMode);
REL::Relocation<func_t> func{ REL::ID(1032309) };
REL::Relocation<func_t> func{ REL::ID(2232986) };
return func(this);
}

Expand Down
4 changes: 2 additions & 2 deletions CommonLibF4/include/RE/Bethesda/SWFToCodeFunctionHandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ namespace RE
void MapCodeMethodToASFunction(const char* a_functionName, std::int32_t a_functionID)
{
using func_t = decltype(&SWFToCodeFunctionHandler::MapCodeMethodToASFunction);
REL::Relocation<func_t> func{ REL::ID(1263128) };
REL::Relocation<func_t> func{ REL::ID(2287419) };
return func(this, a_functionName, a_functionID);
}

void RegisterCodeObject(Scaleform::GFx::Movie& a_movie, Scaleform::GFx::Value& a_menuObj)
{
using func_t = decltype(&SWFToCodeFunctionHandler::RegisterCodeObject);
REL::Relocation<func_t> func{ REL::ID(67637) };
REL::Relocation<func_t> func{ REL::ID(2287415) };
return func(this, a_movie, a_menuObj);
}
};
Expand Down
10 changes: 5 additions & 5 deletions CommonLibF4/include/RE/Bethesda/TESBoundAnimObjects.h
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ namespace RE
[[nodiscard]] TESContainer* GetContainer()
{
using func_t = decltype(&TESFurniture::GetContainer);
REL::Relocation<func_t> func{ REL::ID(1049933) };
REL::Relocation<func_t> func{ REL::ID(2198043) };
return func(this);
}

Expand Down Expand Up @@ -443,7 +443,7 @@ namespace RE
[[nodiscard]] uint32_t GetSex() noexcept
{
using func_t = decltype(&TESNPC::GetSex);
REL::Relocation<func_t> func{ REL::ID(1257181) };
REL::Relocation<func_t> func{ REL::ID(2207107) };
return func(this);
}

Expand Down Expand Up @@ -563,21 +563,21 @@ namespace RE
LOCK_LEVEL GetHackDifficultyLockLevel(TESObjectREFR* a_refr)
{
using func_t = decltype(&BGSTerminal::GetHackDifficultyLockLevel);
REL::Relocation<func_t> func{ REL::ID(537273) };
REL::Relocation<func_t> func{ REL::ID(2197777) };
return func(this, a_refr);
}

static bool IsTerminalRefInUse(TESObjectREFR* a_refr)
{
using func_t = decltype(&BGSTerminal::IsTerminalRefInUse);
REL::Relocation<func_t> func{ REL::ID(1093565) };
REL::Relocation<func_t> func{ REL::ID(2197779) };
return func(a_refr);
}

static void Show(TESObjectREFR* a_refr)
{
using func_t = decltype(&BGSTerminal::Show);
REL::Relocation<func_t> func{ REL::ID(1069012) };
REL::Relocation<func_t> func{ REL::ID(2197776) };
return func(a_refr);
}

Expand Down
6 changes: 3 additions & 3 deletions CommonLibF4/include/RE/Bethesda/TESBoundObjects.h
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ namespace RE
void ApplyMods(BSTSmartPointer<TBO_InstanceData>& a_dest, const BGSObjectInstanceExtra* a_extra) const
{
using func_t = decltype(&TESBoundObject::ApplyMods);
REL::Relocation<func_t> func{ REL::ID(113585) };
REL::Relocation<func_t> func{ REL::ID(2198325) };
return func(this, a_dest, a_extra);
}

Expand Down Expand Up @@ -655,7 +655,7 @@ namespace RE
[[nodiscard]] static bool GetReloadsWithAmmoRef(const TESAmmo* a_ammo)
{
using func_t = decltype(&TESAmmo::GetReloadsWithAmmoRef);
REL::Relocation<func_t> func{ REL::ID(1035622) };
REL::Relocation<func_t> func{ REL::ID(2197864) };
return func(a_ammo);
}

Expand Down Expand Up @@ -793,7 +793,7 @@ namespace RE
bool CollidesWithSmallTransparentLayer()
{
using func_t = decltype(&BGSProjectile::CollidesWithSmallTransparentLayer);
REL::Relocation<func_t> func{ REL::ID(1115694) };
REL::Relocation<func_t> func{ REL::ID(2197620) };
return func(this);
}

Expand Down
6 changes: 3 additions & 3 deletions CommonLibF4/include/RE/Bethesda/TESForms.h
Original file line number Diff line number Diff line change
Expand Up @@ -1698,9 +1698,9 @@ namespace RE
public:
struct RespData
{
std::uint16_t uiPercent;
std::uint8_t ucResponseID;
bool bUseEmotion;
std::uint16_t percent;
std::uint8_t responseID;
bool useEmotion;
};
static_assert(sizeof(RespData) == 0x4);

Expand Down
6 changes: 3 additions & 3 deletions CommonLibF4/include/RE/Bethesda/Workshop.h
Original file line number Diff line number Diff line change
Expand Up @@ -200,21 +200,21 @@ namespace RE
[[nodiscard]] inline TESObjectREFR* FindNearestValidWorkshop(const TESObjectREFR& a_refr)
{
using func_t = decltype(&Workshop::FindNearestValidWorkshop);
REL::Relocation<func_t> func{ REL::ID(905705) };
REL::Relocation<func_t> func{ REL::ID(2194970) };
return func(a_refr);
}

[[nodiscard]] inline bool FreeBuild()
{
using func_t = decltype(&Workshop::FreeBuild);
REL::Relocation<func_t> func{ REL::ID(1583365) };
REL::Relocation<func_t> func{ REL::ID(2194924) };
return func();
}

[[nodiscard]] inline WorkshopMenuNode* GetSelectedWorkshopMenuNode(std::uint32_t a_row, std::uint32_t& a_column)
{
using func_t = decltype(&Workshop::GetSelectedWorkshopMenuNode);
REL::Relocation<func_t> func{ REL::ID(763948) };
REL::Relocation<func_t> func{ REL::ID(2195024) };
return func(a_row, a_column);
}

Expand Down

0 comments on commit 8c6425f

Please sign in to comment.