Skip to content

Commit

Permalink
update for 1.6.640
Browse files Browse the repository at this point in the history
  • Loading branch information
@ianpatt
ianpatt committed Sep 21, 2022
1 parent 01f355d commit 0f1ee17
Show file tree
Hide file tree
Showing 58 changed files with 283 additions and 279 deletions.
4 changes: 2 additions & 2 deletions cmake/versioning.cmake
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
set(SKSE_VERSION_MAJOR 2)
set(SKSE_VERSION_MINOR 2)
set(SKSE_VERSION_PATCH 0)
set(SKSE_VERSION_PATCH 1)

set(RUNTIME_VERSION_MAJOR 1)
set(RUNTIME_VERSION_MINOR 6)
set(RUNTIME_VERSION_PATCH 629)
set(RUNTIME_VERSION_PATCH 640)

math(
EXPR
Expand Down
2 changes: 1 addition & 1 deletion skse64/BSModelDB.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class BSModelDB

MEMBER_FN_PREFIX(TESProcessor);
// find from ??_7BSModelProcessor@BSModelDB@@6B@
DEFINE_MEMBER_FN(dtor, void, 0x00D781F0);
DEFINE_MEMBER_FN(dtor, void, 0x00D78120);
DEFINE_MEMBER_FN(Impl_Process, void, 0x0018CDE0, ModelData * modelData, const char * modelName, NiAVObject ** root, UInt32 * typeOut);
};
};
Expand Down
6 changes: 3 additions & 3 deletions skse64/GameAPI.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ class Heap
{
public:
MEMBER_FN_PREFIX(Heap);
DEFINE_MEMBER_FN(Allocate, void *, 0x00C39A10, size_t size, size_t alignment, bool aligned);
DEFINE_MEMBER_FN(Free, void, 0x00C39E60, void * buf, bool aligned);
DEFINE_MEMBER_FN(Allocate, void *, 0x00C39940, size_t size, size_t alignment, bool aligned);
DEFINE_MEMBER_FN(Free, void, 0x00C39D90, void * buf, bool aligned);
};

extern RelocPtr <Heap> g_mainHeap;
Expand All @@ -21,7 +21,7 @@ class ConsoleManager
{
public:
MEMBER_FN_PREFIX(ConsoleManager);
DEFINE_MEMBER_FN(VPrint, void, 0x0089BA80, const char * fmt, va_list args);
DEFINE_MEMBER_FN(VPrint, void, 0x0089B9B0, const char * fmt, va_list args);
// DEFINE_MEMBER_FN(Print, void, 0x001D2050, const char * str);
};

Expand Down
2 changes: 1 addition & 1 deletion skse64/GameCamera.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ class PlayerCamera : public TESCamera
UInt8 pad166[2]; // 166

MEMBER_FN_PREFIX(PlayerCamera);
DEFINE_MEMBER_FN(UpdateThirdPerson, void, 0x0088B9B0, bool weaponDrawn);
DEFINE_MEMBER_FN(UpdateThirdPerson, void, 0x0088B8E0, bool weaponDrawn);
};

STATIC_ASSERT(offsetof(PlayerCamera, cameraStates) == 0xB8);
Expand Down
4 changes: 2 additions & 2 deletions skse64/GameData.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ RelocAddr<_GetRightHandSlot> GetRightHandSlot(0x00348E40);
//
RelocAddr<_GetLeftHandSlot> GetLeftHandSlot(0x00348E30);
RelocAddr<_LookupActorValueByName> LookupActorValueByName(0x003FC5A0);
RelocAddr<_UpdatePlayerTints> UpdatePlayerTints(0x008F62C0);
RelocAddr<_UpdatePlayerTints> UpdatePlayerTints(0x008F61F0);
RelocAddr<_GetActorBaseOverlays> GetActorBaseOverlays(0x003820E0);
RelocAddr<_GetNumActorBaseOverlays> GetNumActorBaseOverlays(0x00382170);

Expand All @@ -59,7 +59,7 @@ RelocAddr<_GetRelationshipIndex> GetRelationshipIndex(0x0035E1E0);

RelocPtr<FacePresetList> g_facePresetList(0x01E69370); // aNosetype

RelocAddr<_HasLOS> HasLOS(0x0095BA40);
RelocAddr<_HasLOS> HasLOS(0x0095B970);

class LoadedModFinder
{
Expand Down
28 changes: 14 additions & 14 deletions skse64/GameData.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -410,8 +410,8 @@ class EquipManager
static EquipManager * GetSingleton(void);

MEMBER_FN_PREFIX(EquipManager);
DEFINE_MEMBER_FN(EquipItem, void, 0x0066FAF0, Actor * actor, TESForm * item, BaseExtraList * extraData, SInt32 count, BGSEquipSlot * equipSlot, bool withEquipSound, bool preventUnequip, bool showMsg, void * unk);
DEFINE_MEMBER_FN(UnequipItem, bool, 0x006702E0, Actor * actor, TESForm * item, BaseExtraList * extraData, SInt32 count, BGSEquipSlot * equipSlot, bool unkFlag1, bool preventEquip, bool unkFlag2, bool unkFlag3, void * unk);
DEFINE_MEMBER_FN(EquipItem, void, 0x0066FA20, Actor * actor, TESForm * item, BaseExtraList * extraData, SInt32 count, BGSEquipSlot * equipSlot, bool withEquipSound, bool preventUnequip, bool showMsg, void * unk);
DEFINE_MEMBER_FN(UnequipItem, bool, 0x00670210, Actor * actor, TESForm * item, BaseExtraList * extraData, SInt32 count, BGSEquipSlot * equipSlot, bool unkFlag1, bool preventEquip, bool unkFlag2, bool unkFlag3, void * unk);
};


Expand Down Expand Up @@ -527,7 +527,7 @@ class FaceGen
UInt8 pad61[7]; // 61

MEMBER_FN_PREFIX(FaceGen);
DEFINE_MEMBER_FN(RegenerateHead, void, 0x003EA340, BSFaceGenNiNode * headNode, BGSHeadPart * head, TESNPC * npc);
DEFINE_MEMBER_FN(RegenerateHead, void, 0x003EC4A0, BSFaceGenNiNode * headNode, BGSHeadPart * head, TESNPC * npc);
DEFINE_MEMBER_FN(ApplyMorph, void, 0x003EBDA0, BSFaceGenNiNode* faceGenNode, BGSHeadPart* headPart, BSFixedString* morphName, float relative);
};
STATIC_ASSERT(offsetof(FaceGen, isReset) == 0x58);
Expand Down Expand Up @@ -674,11 +674,11 @@ class PersistentFormManager
}

MEMBER_FN_PREFIX(PersistentFormManager);
DEFINE_MEMBER_FN(CreateOffensiveEnchantment, EnchantmentItem *, 0x005D2DD0, tArray<MagicItem::EffectItem> * effectArray);
DEFINE_MEMBER_FN(CreateDefensiveEnchantment, EnchantmentItem *, 0x005D2E70, tArray<MagicItem::EffectItem> * effectArray);
DEFINE_MEMBER_FN(CreatePoison, void, 0x005D2FC0, tArray<MagicItem::EffectItem> * effectArray, AlchemyItem ** poison);
DEFINE_MEMBER_FN(CreatePotion, void, 0x005D2F10, AlchemyItem ** potion, tArray<MagicItem::EffectItem> * effectArray);
DEFINE_MEMBER_FN(ScheduleForDeletion, void, 0x005D32F0, TESForm *);
DEFINE_MEMBER_FN(CreateOffensiveEnchantment, EnchantmentItem *, 0x005D2D00, tArray<MagicItem::EffectItem> * effectArray);
DEFINE_MEMBER_FN(CreateDefensiveEnchantment, EnchantmentItem *, 0x005D2DA0, tArray<MagicItem::EffectItem> * effectArray);
DEFINE_MEMBER_FN(CreatePoison, void, 0x005D2EF0, tArray<MagicItem::EffectItem> * effectArray, AlchemyItem ** poison);
DEFINE_MEMBER_FN(CreatePotion, void, 0x005D2E40, AlchemyItem ** potion, tArray<MagicItem::EffectItem> * effectArray);
DEFINE_MEMBER_FN(ScheduleForDeletion, void, 0x005D3220, TESForm *);
};
STATIC_ASSERT(sizeof(PersistentFormManager) == 0xD0);

Expand Down Expand Up @@ -862,14 +862,14 @@ class BGSSaveLoadManager
UInt8 unk370[0x60]; // 370 - TODO: .?AV?$BSTCommonStaticMessageQueue@V?$BSTSmartPointer@VRequest@saveload@bgs@@UBSTSmartPointerIntrusiveRefCount@@@@$07@@

private:
DEFINE_MEMBER_FN(Save_Internal, bool, 0x005BA240, int unk1, UInt32 unk2, const char * name);
DEFINE_MEMBER_FN(Load_Internal, bool, 0x005BA980, const char * name, int unk1, UInt32 unk2, UInt32 unk3);
DEFINE_MEMBER_FN(Save_Internal, bool, 0x005BA170, int unk1, UInt32 unk2, const char * name);
DEFINE_MEMBER_FN(Load_Internal, bool, 0x005BA8B0, const char * name, int unk1, UInt32 unk2, UInt32 unk3);

DEFINE_MEMBER_FN(SaveGame_HookTarget, void, 0x005B01B0, UInt64 *unk0);
DEFINE_MEMBER_FN(LoadGame_HookTarget, bool, 0x005B08C0, UInt64 *unk0, UInt32 unk1, UInt32 unk2, void *unk3);
DEFINE_MEMBER_FN(SaveGame_HookTarget, void, 0x005B00E0, UInt64 *unk0);
DEFINE_MEMBER_FN(LoadGame_HookTarget, bool, 0x005B07F0, UInt64 *unk0, UInt32 unk1, UInt32 unk2, void *unk3);

DEFINE_MEMBER_FN(ProcessEvents_Internal, void, 0x005BD4F0);
DEFINE_MEMBER_FN(DeleteSavegame, void, 0x005BA1D0, const char * saveName, UInt32 unk1);
DEFINE_MEMBER_FN(ProcessEvents_Internal, void, 0x005BD420);
DEFINE_MEMBER_FN(DeleteSavegame, void, 0x005BA100, const char * saveName, UInt32 unk1);
};
STATIC_ASSERT(offsetof(BGSSaveLoadManager, thread) == 0x2B0);
STATIC_ASSERT(offsetof(BGSSaveLoadManager::Thread, hThread) == 0x30);
Expand Down
2 changes: 1 addition & 1 deletion skse64/GameEvents.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class EventDispatcher
// Note: in SE there are multiple identical copies of all these functions
MEMBER_FN_PREFIX(EventDispatcher);
// 9FCA8C7632C2FC6D6E342E554B43402121BC4E44+66
DEFINE_MEMBER_FN(AddEventSink_Internal, void, 0x0058F5B0, SinkT * eventSink);
DEFINE_MEMBER_FN(AddEventSink_Internal, void, 0x0058F4E0, SinkT * eventSink);
// ??_7BGSProcedureShoutExecState@@6B@ xref +21 last call
DEFINE_MEMBER_FN(RemoveEventSink_Internal, void, 0x0043E990, SinkT * eventSink);
// FB59C2DDF89F5248DF43230E39A6FECF8C997BA6+466
Expand Down
28 changes: 14 additions & 14 deletions skse64/GameExtraData.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,33 @@
#include "HashUtil.h"

// ??_7ExtraHealth@@6B@
const RelocPtr<uintptr_t> s_ExtraHealthVtbl(0x01622AA0);
const RelocPtr<uintptr_t> s_ExtraHealthVtbl(0x01622A90);
// ??_7ExtraCharge@@6B@
const RelocPtr<uintptr_t> s_ExtraChargeVtbl(0x01622B00);
const RelocPtr<uintptr_t> s_ExtraChargeVtbl(0x01622AF0);
// ??_7ExtraCount@@6B@
const RelocPtr<uintptr_t> s_ExtraCountVtbl(0x01622A20);
const RelocPtr<uintptr_t> s_ExtraCountVtbl(0x01622A10);
// ??_7ExtraTextDisplayData@@6B@
const RelocPtr<uintptr_t> s_ExtraTextDisplayVtbl(0x01623520);
const RelocPtr<uintptr_t> s_ExtraTextDisplayVtbl(0x01623510);
// ??_7ExtraSoul@@6B@
const RelocPtr<uintptr_t> s_ExtraSoulVtbl(0x01626270);
const RelocPtr<uintptr_t> s_ExtraSoulVtbl(0x01626260);
// ??_7ExtraOwnership@@6B@
const RelocPtr<uintptr_t> s_ExtraOwnershipVtbl(0x016229C0);
const RelocPtr<uintptr_t> s_ExtraOwnershipVtbl(0x016229B0);
// ??_7ExtraAliasInstanceArray@@6B@
const RelocPtr<uintptr_t> s_ExtraAliasInstanceArrayVtbl(0x016233E0);
const RelocPtr<uintptr_t> s_ExtraAliasInstanceArrayVtbl(0x016233D0);
// ??_7ExtraCannotWear@@6B@
const RelocPtr<uintptr_t> s_ExtraCannotWearVtbl(0x01622A80);
const RelocPtr<uintptr_t> s_ExtraCannotWearVtbl(0x01622A70);
// ??_7ExtraHotkey@@6B@
const RelocPtr<uintptr_t> s_ExtraHotkeyVtbl(0x01622B60);
const RelocPtr<uintptr_t> s_ExtraHotkeyVtbl(0x01622B50);
// ??_7ExtraForcedTarget@@6B@
const RelocPtr<uintptr_t> s_ExtraForcedTargetVtbl(0x016235A0);
const RelocPtr<uintptr_t> s_ExtraForcedTargetVtbl(0x01623590);
// ??_7ExtraReferenceHandle@@6B@
const RelocPtr<uintptr_t> s_ExtraReferenceHandleVtbl(0x01622BA0);
const RelocPtr<uintptr_t> s_ExtraReferenceHandleVtbl(0x01622B90);
// ??_7ExtraEnchantment@@6B@
const RelocPtr<uintptr_t> s_ExtraEnchantmentVtbl(0x01622EC0);
const RelocPtr<uintptr_t> s_ExtraEnchantmentVtbl(0x01622EB0);
// ??_7ExtraRank@@6B@
const RelocPtr<uintptr_t> s_ExtraRankVtbl(0x01622A00);
const RelocPtr<uintptr_t> s_ExtraRankVtbl(0x016229F0);
// ??_7ExtraUniqueID@@6B@
const RelocPtr<uintptr_t> s_ExtraUniqueIdVtbl(0x016235E0);
const RelocPtr<uintptr_t> s_ExtraUniqueIdVtbl(0x016235D0);

ExtraHealth* ExtraHealth::Create()
{
Expand Down
12 changes: 6 additions & 6 deletions skse64/GameFormComponents.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1296,10 +1296,10 @@ class ActorProcessManager
UInt32 pad13C; // 13C

MEMBER_FN_PREFIX(ActorProcessManager);
DEFINE_MEMBER_FN(SetEquipFlag, void, 0x006B7D60, UInt8 flags);
DEFINE_MEMBER_FN(UpdateEquipment, void, 0x00689E10, Actor * actor);
DEFINE_MEMBER_FN(SetEquipFlag, void, 0x006B7C90, UInt8 flags);
DEFINE_MEMBER_FN(UpdateEquipment, void, 0x00689D40, Actor * actor);
// CDC12817DF3AB5B832348763F433A216BB8A85CA+89
DEFINE_MEMBER_FN(SetDataFlag, void, 0x00695A70, float flag); // Sets a number on the 0x10 object
DEFINE_MEMBER_FN(SetDataFlag, void, 0x006959A0, float flag); // Sets a number on the 0x10 object

void UpdateEquipment_Hooked(Actor * actor);
};
Expand Down Expand Up @@ -1383,9 +1383,9 @@ class PlayerSkills
void SetSkillLegendaryLevel(BSFixedString actorValue, UInt32 level);

MEMBER_FN_PREFIX(PlayerSkills);
DEFINE_MEMBER_FN(GetSkillData, UInt32, 0x00720F70, UInt32 actorValue, float * level, float * points, float * pointsMax, UInt32 * unk6);
DEFINE_MEMBER_FN(IncrementLegendary, UInt32, 0x00721560, UInt32 actorValue);
DEFINE_MEMBER_FN(SetLevel, void, 0x00721500, UInt32 level);
DEFINE_MEMBER_FN(GetSkillData, UInt32, 0x00720EA0, UInt32 actorValue, float * level, float * points, float * pointsMax, UInt32 * unk6);
DEFINE_MEMBER_FN(IncrementLegendary, UInt32, 0x00721490, UInt32 actorValue);
DEFINE_MEMBER_FN(SetLevel, void, 0x00721430, UInt32 level);
};

// 10
Expand Down
26 changes: 13 additions & 13 deletions skse64/GameHandlers.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class WeaponRightSwingHandler : public IHandlerFunctor<Actor, UInt32>
virtual UInt8 Process(Actor * form, UInt32 unk04);

MEMBER_FN_PREFIX(WeaponRightSwingHandler);
DEFINE_MEMBER_FN(Process_Origin, UInt8, 0x0075DB60, Actor * form, UInt32 unk04);
DEFINE_MEMBER_FN(Process_Origin, UInt8, 0x0075DA90, Actor * form, UInt32 unk04);
};

class WeaponLeftSwingHandler : public IHandlerFunctor<Actor, UInt32>
Expand All @@ -42,7 +42,7 @@ class WeaponLeftSwingHandler : public IHandlerFunctor<Actor, UInt32>
virtual UInt8 Process(Actor * form, UInt32 unk04);

MEMBER_FN_PREFIX(WeaponLeftSwingHandler);
DEFINE_MEMBER_FN(Process_Origin, UInt8, 0x0075DBF0, Actor * form, UInt32 unk04);
DEFINE_MEMBER_FN(Process_Origin, UInt8, 0x0075DB20, Actor * form, UInt32 unk04);
};

class RightHandSpellFireHandler : public IHandlerFunctor<Actor, UInt32>
Expand All @@ -52,7 +52,7 @@ class RightHandSpellFireHandler : public IHandlerFunctor<Actor, UInt32>
virtual UInt8 Process(Actor * form, UInt32 unk04);

MEMBER_FN_PREFIX(RightHandSpellFireHandler);
DEFINE_MEMBER_FN(Process_Origin, UInt8, 0x0075DDB0, Actor * form, UInt32 unk04);
DEFINE_MEMBER_FN(Process_Origin, UInt8, 0x0075DCE0, Actor * form, UInt32 unk04);
};

class LeftHandSpellFireHandler : public IHandlerFunctor<Actor, UInt32>
Expand All @@ -62,7 +62,7 @@ class LeftHandSpellFireHandler : public IHandlerFunctor<Actor, UInt32>
virtual UInt8 Process(Actor * form, UInt32 unk04);

MEMBER_FN_PREFIX(LeftHandSpellFireHandler);
DEFINE_MEMBER_FN(Process_Origin, UInt8, 0x0075DD60, Actor * form, UInt32 unk04);
DEFINE_MEMBER_FN(Process_Origin, UInt8, 0x0075DC90, Actor * form, UInt32 unk04);
};

class RightHandSpellCastHandler : public IHandlerFunctor<Actor, UInt32>
Expand All @@ -72,7 +72,7 @@ class RightHandSpellCastHandler : public IHandlerFunctor<Actor, UInt32>
virtual UInt8 Process(Actor * form, UInt32 unk04);

MEMBER_FN_PREFIX(RightHandSpellCastHandler);
DEFINE_MEMBER_FN(Process_Origin, UInt8, 0x0075DF70, Actor * form, UInt32 unk04);
DEFINE_MEMBER_FN(Process_Origin, UInt8, 0x0075DEA0, Actor * form, UInt32 unk04);
};

class LeftHandSpellCastHandler : public IHandlerFunctor<Actor, UInt32>
Expand All @@ -82,7 +82,7 @@ class LeftHandSpellCastHandler : public IHandlerFunctor<Actor, UInt32>
virtual UInt8 Process(Actor * form, UInt32 unk04);

MEMBER_FN_PREFIX(LeftHandSpellCastHandler);
DEFINE_MEMBER_FN(Process_Origin, UInt8, 0x0075DF20, Actor * form, UInt32 unk04);
DEFINE_MEMBER_FN(Process_Origin, UInt8, 0x0075DE50, Actor * form, UInt32 unk04);
};

class VoiceSpellCastHandler : public IHandlerFunctor<Actor, UInt32>
Expand All @@ -92,7 +92,7 @@ class VoiceSpellCastHandler : public IHandlerFunctor<Actor, UInt32>
virtual UInt8 Process(Actor * form, UInt32 unk04);

MEMBER_FN_PREFIX(VoiceSpellCastHandler);
DEFINE_MEMBER_FN(Process_Origin, UInt8, 0x0075DFC0, Actor * form, UInt32 unk04);
DEFINE_MEMBER_FN(Process_Origin, UInt8, 0x0075DEF0, Actor * form, UInt32 unk04);
};

class VoiceSpellFireHandler : public IHandlerFunctor<Actor, UInt32>
Expand All @@ -102,7 +102,7 @@ class VoiceSpellFireHandler : public IHandlerFunctor<Actor, UInt32>
virtual UInt8 Process(Actor * form, UInt32 unk04);

MEMBER_FN_PREFIX(VoiceSpellFireHandler);
DEFINE_MEMBER_FN(Process_Origin, UInt8, 0x0075DE00, Actor * form, UInt32 unk04);
DEFINE_MEMBER_FN(Process_Origin, UInt8, 0x0075DD30, Actor * form, UInt32 unk04);
};

class BowDrawnHandler : public IHandlerFunctor<Actor, UInt32>
Expand All @@ -112,7 +112,7 @@ class BowDrawnHandler : public IHandlerFunctor<Actor, UInt32>
virtual UInt8 Process(Actor * form, UInt32 unk04);

MEMBER_FN_PREFIX(BowDrawnHandler);
DEFINE_MEMBER_FN(Process_Origin, UInt8, 0x0075F220, Actor * form, UInt32 unk04);
DEFINE_MEMBER_FN(Process_Origin, UInt8, 0x0075F150, Actor * form, UInt32 unk04);
};

class BowReleaseHandler : public IHandlerFunctor<Actor, UInt32>
Expand All @@ -122,7 +122,7 @@ class BowReleaseHandler : public IHandlerFunctor<Actor, UInt32>
virtual UInt8 Process(Actor * form, UInt32 unk04);

MEMBER_FN_PREFIX(BowReleaseHandler);
DEFINE_MEMBER_FN(Process_Origin, UInt8, 0x0075F240, Actor * form, UInt32 unk04);
DEFINE_MEMBER_FN(Process_Origin, UInt8, 0x0075F170, Actor * form, UInt32 unk04);
};

class WeaponBeginDrawRightHandler : public IHandlerFunctor<Actor, UInt32>
Expand All @@ -132,7 +132,7 @@ class WeaponBeginDrawRightHandler : public IHandlerFunctor<Actor, UInt32>
virtual UInt8 Process(Actor * form, UInt32 unk04);

MEMBER_FN_PREFIX(WeaponBeginDrawRightHandler);
DEFINE_MEMBER_FN(Process_Origin, UInt8, 0x0075E050, Actor * form, UInt32 unk04);
DEFINE_MEMBER_FN(Process_Origin, UInt8, 0x0075DF80, Actor * form, UInt32 unk04);
};

class WeaponBeginSheatheRightHandler : public IHandlerFunctor<Actor, UInt32>
Expand All @@ -142,7 +142,7 @@ class WeaponBeginSheatheRightHandler : public IHandlerFunctor<Actor, UInt32>
virtual UInt8 Process(Actor * form, UInt32 unk04);

MEMBER_FN_PREFIX(WeaponBeginSheatheRightHandler);
DEFINE_MEMBER_FN(Process_Origin, UInt8, 0x0075E100, Actor * form, UInt32 unk04);
DEFINE_MEMBER_FN(Process_Origin, UInt8, 0x0075E030, Actor * form, UInt32 unk04);
};

class RightHandWeaponDrawHandler : public IHandlerFunctor<Actor, UInt32>
Expand All @@ -152,7 +152,7 @@ class RightHandWeaponDrawHandler : public IHandlerFunctor<Actor, UInt32>
virtual UInt8 Process(Actor * form, UInt32 unk04);

MEMBER_FN_PREFIX(RightHandWeaponDrawHandler);
DEFINE_MEMBER_FN(Process_Origin, UInt8, 0x0075E170, Actor * form, UInt32 unk04);
DEFINE_MEMBER_FN(Process_Origin, UInt8, 0x0075E0A0, Actor * form, UInt32 unk04);
};

class RightHandWeaponSheatheHandler : public IHandlerFunctor<Actor, UInt32>
Expand Down
2 changes: 1 addition & 1 deletion skse64/GameInput.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ class PlayerControls
// used by Hooks_Event
PlayerControls * ctor_Hook(void);
MEMBER_FN_PREFIX(PlayerControls);
DEFINE_MEMBER_FN(ctor, PlayerControls *, 0x00740670);
DEFINE_MEMBER_FN(ctor, PlayerControls *, 0x007405A0);
};
STATIC_ASSERT(offsetof(PlayerControls, runMode) == 0x049);
STATIC_ASSERT(offsetof(PlayerControls, remapMode) == 0x050);
Expand Down
2 changes: 1 addition & 1 deletion skse64/GameMenus.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "GameMenus.h"

RelocAddr <_CreateUIMessageData> CreateUIMessageData(0x005C28D0);
RelocAddr <_CreateUIMessageData> CreateUIMessageData(0x005C2800);

IMenu::IMenu() :
view(NULL),
Expand Down
Loading

2 comments on commit 0f1ee17

@SlavicPotato
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One slipped through, RightHandWeaponSheatheHandler::Process_Origin. It's at 0x75E200.

@ianpatt
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, thanks for noticing and letting me know.

Please sign in to comment.