Skip to content

Commit 8c30ba7

Browse files
committed
feat: merge upstream
2 parents 2d7b946 + 3a1d852 commit 8c30ba7

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

include/RE/G/GiftMenuCallbackFunc.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ namespace RE
1313
{
1414
class GiftMenuCallbackFunc : public IGiftMenuScriptCallback
1515
{
16-
inline static constexpr auto RTTI = RTTI_SkyrimScript__A0x17558f7c____GiftMenuCallbackFunc;
17-
inline static constexpr auto VTABLE = VTABLE_SkyrimScript__A0x17558f7c____GiftMenuCallbackFunc;
16+
inline static constexpr auto RTTI = RTTI_SkyrimScript__GiftMenuCallbackFunc;
17+
inline static constexpr auto VTABLE = VTABLE_SkyrimScript__GiftMenuCallbackFunc;
1818

1919
virtual ~GiftMenuCallbackFunc(); // 00
2020

include/RE/Offsets_RTTI.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5817,7 +5817,7 @@ namespace RE
58175817
inline constexpr REL::ID RTTI_SkyEffectController{ 393321 };
58185818
inline constexpr REL::ID RTTI_SkyObject{ 393312 };
58195819
inline constexpr REL::ID RTTI_SkyStaticFindFunctor{ 393322 };
5820-
inline constexpr REL::ID RTTI_SkyrimScript__A0x17558f7c____GiftMenuCallbackFunc{ 397044 };
5820+
inline constexpr REL::ID RTTI_SkyrimScript__GiftMenuCallbackFunc{ 397044 };
58215821
inline constexpr REL::ID RTTI_SkyrimScript__BaseHandleReaderWriter{ 392603 };
58225822
inline constexpr REL::ID RTTI_SkyrimScript__ConcreteDelayFunctorFactory_SkyrimScript____AddItemFunctor_20_{ 397282 };
58235823
inline constexpr REL::ID RTTI_SkyrimScript__ConcreteDelayFunctorFactory_SkyrimScript____AddRemoveConstraintFunctor_15_{ 397166 };

include/RE/Offsets_VTABLE.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5314,7 +5314,7 @@ namespace RE
53145314
inline constexpr std::array<REL::ID, 1> VTABLE_SkyEffectController{ REL::ID(196496) };
53155315
inline constexpr std::array<REL::ID, 1> VTABLE_SkyObject{ REL::ID(196515) };
53165316
inline constexpr std::array<REL::ID, 1> VTABLE_SkyStaticFindFunctor{ REL::ID(196502) };
5317-
inline constexpr std::array<REL::ID, 1> VTABLE_SkyrimScript__A0x17558f7c____GiftMenuCallbackFunc{ REL::ID(217429) };
5317+
inline constexpr std::array<REL::ID, 1> VTABLE_SkyrimScript__GiftMenuCallbackFunc{ REL::ID(217429) };
53185318
inline constexpr std::array<REL::ID, 1> VTABLE_SkyrimScript__BaseHandleReaderWriter{ REL::ID(187903) };
53195319
inline constexpr std::array<REL::ID, 1> VTABLE_SkyrimScript__ConcreteDelayFunctorFactory_SkyrimScript____AddItemFunctor_20_{ REL::ID(218374) };
53205320
inline constexpr std::array<REL::ID, 1> VTABLE_SkyrimScript__ConcreteDelayFunctorFactory_SkyrimScript____AddRemoveConstraintFunctor_15_{ REL::ID(217880) };

0 commit comments

Comments
 (0)