diff --git a/include/RE/E/Events.h b/include/RE/E/Events.h index 887c3c6f..88d3a87f 100644 --- a/include/RE/E/Events.h +++ b/include/RE/E/Events.h @@ -213,7 +213,7 @@ namespace RE kLeave = 1 }; - [[nodiscard]] auto GetCell() const { return TESForm::GetFormByID(formID); } + [[nodiscard]] auto GetCell() const { return TESForm::LookupByID(formID); } [[nodiscard]] constexpr bool IsEnter() const noexcept { return type == Type::kEnter; } [[nodiscard]] constexpr bool IsLeave() const noexcept { return type == Type::kLeave; } diff --git a/include/RE/IDs.h b/include/RE/IDs.h index 9c27ee32..9e7db4fb 100644 --- a/include/RE/IDs.h +++ b/include/RE/IDs.h @@ -527,8 +527,8 @@ namespace RE::ID { inline constexpr REL::ID DecExternalRefCount{ 34165 }; inline constexpr REL::ID DecRefCount{ 35164 }; - inline constexpr REL::ID GetFormByID{ 86125 }; - inline constexpr REL::ID GetFormByEditorID{ 86123 }; + inline constexpr REL::ID LookupByID{ 86125 }; + inline constexpr REL::ID LookupByEditorID{ 86123 }; } namespace TESNPC diff --git a/include/RE/T/TESForm.h b/include/RE/T/TESForm.h index 6d4ec351..bf53b665 100644 --- a/include/RE/T/TESForm.h +++ b/include/RE/T/TESForm.h @@ -159,31 +159,31 @@ namespace RE return func(this); } - [[nodiscard]] static TESForm* GetFormByID(TESFormID a_formID) + [[nodiscard]] static TESForm* LookupByID(TESFormID a_formID) { using func_t = TESForm* (*)(TESFormID); - static REL::Relocation func{ ID::TESForm::GetFormByID }; + static REL::Relocation func{ ID::TESForm::LookupByID }; return func(a_formID); } template - [[nodiscard]] static T* GetFormByID(TESFormID a_formID) + [[nodiscard]] static T* LookupByID(TESFormID a_formID) { - const auto form = GetFormByID(a_formID); + const auto form = LookupByID(a_formID); return form ? form->As() : nullptr; } - [[nodiscard]] static TESForm* GetFormByEditorID(const BSFixedString& a_editorID) + [[nodiscard]] static TESForm* LookupByEditorID(const BSFixedString& a_editorID) { using func_t = TESForm* (*)(const BSFixedString&); - static REL::Relocation func{ ID::TESForm::GetFormByEditorID }; + static REL::Relocation func{ ID::TESForm::LookupByEditorID }; return func(a_editorID); } template - [[nodiscard]] static T* GetFormByEditorID(const BSFixedString& a_editorID) + [[nodiscard]] static T* LookupByEditorID(const BSFixedString& a_editorID) { - const auto form = GetFormByEditorID(a_editorID); + const auto form = LookupByEditorID(a_editorID); return form ? form->As() : nullptr; }