Skip to content
This repository was archived by the owner on Sep 16, 2025. It is now read-only.

fix!: add missing bool argument to TESObjectREFR::IsInSpace, TESObjectREFR::GetAttachedSpaceship #91

Merged
gottyduke merged 1 commit into from
Sep 24, 2023
Merged

fix!: add missing bool argument to TESObjectREFR::IsInSpace, TESObjectREFR::GetAttachedSpaceship #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions CommonLibSF/include/RE/T/TESObjectREFR.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,13 +279,10 @@ namespace RE
virtual void Unk_12E(); // 12E
virtual void Unk_12F(); // 12F

[[nodiscard]] constexpr NiPoint3A GetAngle() const { return data.angle; }
[[nodiscard]] constexpr float GetAngleX() const { return data.angle.x; }
[[nodiscard]] constexpr float GetAngleY() const { return data.angle.y; }
[[nodiscard]] constexpr float GetAngleZ() const { return data.angle.z; }

// NiPointer<TESObjectREFR>
[[nodiscard]] TESObjectREFR* GetAttachedSpaceship();
[[nodiscard]] constexpr NiPoint3A GetAngle() const { return data.angle; }
[[nodiscard]] constexpr float GetAngleX() const { return data.angle.x; }
[[nodiscard]] constexpr float GetAngleY() const { return data.angle.y; }
[[nodiscard]] constexpr float GetAngleZ() const { return data.angle.z; }
[[nodiscard]] TESBoundObject* GetBaseObject() { return data.objectReference; }
[[nodiscard]] const TESBoundObject* GetBaseObject() const { return data.objectReference; };
[[nodiscard]] BGSLocation* GetCurrentLocation();
Expand All @@ -295,12 +292,13 @@ namespace RE
[[nodiscard]] constexpr float GetPositionX() const noexcept { return data.location.x; }
[[nodiscard]] constexpr float GetPositionY() const noexcept { return data.location.y; }
[[nodiscard]] constexpr float GetPositionZ() const noexcept { return data.location.z; }
[[nodiscard]] TESObjectREFR* GetSpaceship(bool a_arg1 = true);
[[nodiscard]] TESObjectREFR* GetSpaceshipParentDock();
[[nodiscard]] Actor* GetSpaceshipPilot();
[[nodiscard]] std::int32_t GetValue();
[[nodiscard]] bool HasKeyword(BGSKeyword* a_keyword);
[[nodiscard]] bool IsCrimeToActivate();
[[nodiscard]] bool IsInSpace();
[[nodiscard]] bool IsInSpace(bool a_arg1);

// members
std::uint32_t unk80; // 80
Expand Down
18 changes: 9 additions & 9 deletions CommonLibSF/src/RE/T/TESObjectREFR.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,6 @@

namespace RE
{
TESObjectREFR* TESObjectREFR::GetAttachedSpaceship()
{
using func_t = decltype(&TESObjectREFR::GetAttachedSpaceship);
REL::Relocation<func_t> func{ REL::Offset(0x02B3A714) };
return func(this);
}

BGSLocation* TESObjectREFR::GetCurrentLocation()
{
using func_t = decltype(&TESObjectREFR::GetCurrentLocation);
Expand All @@ -30,6 +23,13 @@ namespace RE
return func(this);
}

TESObjectREFR* TESObjectREFR::GetSpaceship(bool a_arg1)
{
using func_t = decltype(&TESObjectREFR::GetSpaceship);
REL::Relocation<func_t> func{ REL::Offset(0x02B3A714) };
return func(this, a_arg1);
}

TESObjectREFR* TESObjectREFR::GetSpaceshipParentDock()
{
using func_t = decltype(&TESObjectREFR::GetSpaceshipParentDock);
Expand Down Expand Up @@ -65,10 +65,10 @@ namespace RE
return func(this);
}

bool TESObjectREFR::IsInSpace()
bool TESObjectREFR::IsInSpace(bool a_arg1)
{
using func_t = decltype(&TESObjectREFR::IsInSpace);
REL::Relocation<func_t> func{ REL::Offset(0x01A0E1C8) };
return func(this);
return func(this, a_arg1);
}
}