Skip to content

Commit

Permalink
1.6.1130
Browse files Browse the repository at this point in the history
  • Loading branch information
ianpatt committed Dec 5, 2023
1 parent 4f4f1f6 commit 38050f1
Show file tree
Hide file tree
Showing 66 changed files with 333 additions and 333 deletions.
2 changes: 1 addition & 1 deletion cmake/versioning.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set(SKSE_VERSION_PATCH 4)

set(RUNTIME_VERSION_MAJOR 1)
set(RUNTIME_VERSION_MINOR 6)
set(RUNTIME_VERSION_PATCH 1127)
set(RUNTIME_VERSION_PATCH 1130)
set(RUNTIME_VERSION_TYPE 0)

math(
Expand Down
4 changes: 2 additions & 2 deletions skse64/BSModelDB.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ class BSModelDB

MEMBER_FN_PREFIX(TESProcessor);
// find from ??_7BSModelProcessor@BSModelDB@@6B@
DEFINE_MEMBER_FN(dtor, void, 0x00DFEDA0);
DEFINE_MEMBER_FN(Impl_Process, void, 0x001CC0F0, ModelData * modelData, const char * modelName, NiAVObject ** root, UInt32 * typeOut);
DEFINE_MEMBER_FN(dtor, void, 0x00DFEEE0);
DEFINE_MEMBER_FN(Impl_Process, void, 0x001CC100, ModelData * modelData, const char * modelName, NiAVObject ** root, UInt32 * typeOut);
};
};

Expand Down
6 changes: 3 additions & 3 deletions skse64/GameAPI.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ class Heap
{
public:
MEMBER_FN_PREFIX(Heap);
DEFINE_MEMBER_FN(Allocate, void *, 0x00CBF350, size_t size, size_t alignment, bool aligned);
DEFINE_MEMBER_FN(Free, void, 0x00CBF7A0, void * buf, bool aligned);
DEFINE_MEMBER_FN(Allocate, void *, 0x00CBF490, size_t size, size_t alignment, bool aligned);
DEFINE_MEMBER_FN(Free, void, 0x00CBF8E0, void * buf, bool aligned);
};

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

Expand Down
4 changes: 2 additions & 2 deletions skse64/GameBSExtraData.h
Original file line number Diff line number Diff line change
Expand Up @@ -257,10 +257,10 @@ class BaseExtraList
private:
MEMBER_FN_PREFIX(BaseExtraList);
// A7985F15034C77C00ACC57607F29F4802502A1BA+2F
DEFINE_MEMBER_FN(CheckContainerExtraData_Internal, bool, 0x00159A20, bool isEquipped);
DEFINE_MEMBER_FN(CheckContainerExtraData_Internal, bool, 0x00159A30, bool isEquipped);
// This also does some internal ReferenceHandle lookup
//
DEFINE_MEMBER_FN(GetExtraTextDisplayData_Internal, ExtraTextDisplayData*, 0x0015D800);
DEFINE_MEMBER_FN(GetExtraTextDisplayData_Internal, ExtraTextDisplayData*, 0x0015D810);
};

typedef tList<BaseExtraList> ExtendDataList;
Expand Down
8 changes: 4 additions & 4 deletions skse64/GameCamera.h
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ class TESCamera
UInt8 pad31[7]; // 31

MEMBER_FN_PREFIX(TESCamera);
DEFINE_MEMBER_FN(SetCameraState, UInt32, 0x00550EC0, TESCameraState * cameraState);
DEFINE_MEMBER_FN(SetCameraState, UInt32, 0x00551070, TESCameraState * cameraState);
};
STATIC_ASSERT(offsetof(TESCamera, cameraNode) == 0x20);
STATIC_ASSERT(sizeof(TESCamera) == 0x38);
Expand Down Expand Up @@ -297,8 +297,8 @@ class LocalMapCamera : public TESCamera
void SetDefaultStateBounds(float x, float y, float z);

MEMBER_FN_PREFIX(LocalMapCamera);
DEFINE_MEMBER_FN(ctor, void, 0x00242450);
DEFINE_MEMBER_FN(SetNorthRotation, void, 0x002428A0, float northRotation);
DEFINE_MEMBER_FN(ctor, void, 0x00242460);
DEFINE_MEMBER_FN(SetNorthRotation, void, 0x002428B0, float northRotation);
};

STATIC_ASSERT(offsetof(LocalMapCamera, northRotation) == 0x60);
Expand Down Expand Up @@ -380,7 +380,7 @@ class PlayerCamera : public TESCamera
UInt8 pad166[2]; // 166

MEMBER_FN_PREFIX(PlayerCamera);
DEFINE_MEMBER_FN(UpdateThirdPerson, void, 0x008E59C0, bool weaponDrawn);
DEFINE_MEMBER_FN(UpdateThirdPerson, void, 0x008E5D40, bool weaponDrawn);
};

STATIC_ASSERT(offsetof(PlayerCamera, cameraStates) == 0xB8);
Expand Down
30 changes: 15 additions & 15 deletions skse64/GameData.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,31 +36,31 @@ RelocPtr <EquipManager *> g_equipManager(0x030EF378);
// FBC6C0FB3A858D20081F5FF9CB3E780E59DCE52F+50
RelocPtr <RelationshipRanks> g_relationshipRanks(0x01E66FE8);

RelocAddr<_ChangeActorHeadPart> ChangeActorHeadPart(0x00436020);
RelocAddr<_ChangeActorHeadPart> ChangeActorHeadPart(0x004361C0);
//
RelocAddr<_GetEitherHandSlot> GetEitherHandSlot(0x00388700);
RelocAddr<_GetEitherHandSlot> GetEitherHandSlot(0x003888A0);
//
RelocAddr<_GetRightHandSlot> GetRightHandSlot(0x003886F0);
RelocAddr<_GetRightHandSlot> GetRightHandSlot(0x00388890);
//
RelocAddr<_GetLeftHandSlot> GetLeftHandSlot(0x003886E0);
RelocAddr<_LookupActorValueByName> LookupActorValueByName(0x0043BC10);
RelocAddr<_UpdatePlayerTints> UpdatePlayerTints(0x00954C70);
RelocAddr<_GetActorBaseOverlays> GetActorBaseOverlays(0x003C19B0);
RelocAddr<_GetNumActorBaseOverlays> GetNumActorBaseOverlays(0x003C1A40);
RelocAddr<_GetLeftHandSlot> GetLeftHandSlot(0x00388880);
RelocAddr<_LookupActorValueByName> LookupActorValueByName(0x0043BDB0);
RelocAddr<_UpdatePlayerTints> UpdatePlayerTints(0x00954F30);
RelocAddr<_GetActorBaseOverlays> GetActorBaseOverlays(0x003C1B50);
RelocAddr<_GetNumActorBaseOverlays> GetNumActorBaseOverlays(0x003C1BE0);

RelocAddr<_ApplyMasksToRenderTarget> ApplyMasksToRenderTarget(0x00434E80);
RelocAddr<_ApplyMasksToRenderTarget> ApplyMasksToRenderTarget(0x00435020);

RelocAddr<_UpdateModelSkin> UpdateModelSkin(0x00436350); // Applies tint to ShaderType 5 nodes
RelocAddr<_UpdateModelHair> UpdateModelHair(0x00436460); // Applies tint to ShaderType 6 nodes
RelocAddr<_UpdateModelFace> UpdateModelFace(0x004359C0);
RelocAddr<_UpdateHarvestModel> UpdateHarvestModel(0x001E9350);
RelocAddr<_UpdateModelSkin> UpdateModelSkin(0x004364F0); // Applies tint to ShaderType 5 nodes
RelocAddr<_UpdateModelHair> UpdateModelHair(0x00436600); // Applies tint to ShaderType 6 nodes
RelocAddr<_UpdateModelFace> UpdateModelFace(0x00435B60);
RelocAddr<_UpdateHarvestModel> UpdateHarvestModel(0x001E9360);

RelocAddr<_GetRelationshipIndex> GetRelationshipIndex(0x0039DAB0);
RelocAddr<_GetRelationshipIndex> GetRelationshipIndex(0x0039DC50);

// 63503D87B68DB4A4C8A2BE534A75246035A76798+82
RelocPtr<FacePresetList> g_facePresetList(0x01FEC470); // aNosetype

RelocAddr<_HasLOS> HasLOS(0x009BA2B0);
RelocAddr<_HasLOS> HasLOS(0x009BA570);

class LoadedModFinder
{
Expand Down
36 changes: 18 additions & 18 deletions skse64/GameData.h
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ class DataHandler
UInt32 LoadScripts_Hook();

MEMBER_FN_PREFIX(DataHandler);
DEFINE_MEMBER_FN(LoadScripts, UInt32, 0x001BCAC0);
DEFINE_MEMBER_FN(LoadScripts, UInt32, 0x001BCAD0);
};

STATIC_ASSERT(offsetof(DataHandler, regionList) == 0xD00);
Expand Down Expand Up @@ -410,8 +410,8 @@ class EquipManager
static EquipManager * GetSingleton(void);

MEMBER_FN_PREFIX(EquipManager);
DEFINE_MEMBER_FN(EquipItem, void, 0x006C9990, Actor * actor, TESForm * item, BaseExtraList * extraData, SInt32 count, BGSEquipSlot * equipSlot, bool withEquipSound, bool preventUnequip, bool showMsg, void * unk);
DEFINE_MEMBER_FN(UnequipItem, bool, 0x006CA180, 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, 0x006C9D10, Actor * actor, TESForm * item, BaseExtraList * extraData, SInt32 count, BGSEquipSlot * equipSlot, bool withEquipSound, bool preventUnequip, bool showMsg, void * unk);
DEFINE_MEMBER_FN(UnequipItem, bool, 0x006CA500, Actor * actor, TESForm * item, BaseExtraList * extraData, SInt32 count, BGSEquipSlot * equipSlot, bool unkFlag1, bool preventEquip, bool unkFlag2, bool unkFlag3, void * unk);
};


Expand Down Expand Up @@ -491,8 +491,8 @@ class FaceGen
{
public:
MEMBER_FN_PREFIX(MorphDatabase);
DEFINE_MEMBER_FN(GetFaceGenModelMapEntry, bool, 0x0042E9D0, const char * meshPath, BSFaceGenModelMap ** entry);
DEFINE_MEMBER_FN(SetFaceGenModelMapEntry, void, 0x0042E880, const char * meshPath, BSFaceGenModel * model);
DEFINE_MEMBER_FN(GetFaceGenModelMapEntry, bool, 0x0042EB70, const char * meshPath, BSFaceGenModelMap ** entry);
DEFINE_MEMBER_FN(SetFaceGenModelMapEntry, void, 0x0042EA20, const char * meshPath, BSFaceGenModel * model);

UInt64 unk00; // 00
UInt32 unk08; // 08
Expand Down Expand Up @@ -527,8 +527,8 @@ class FaceGen
UInt8 pad61[7]; // 61

MEMBER_FN_PREFIX(FaceGen);
DEFINE_MEMBER_FN(RegenerateHead, void, 0x0042BB00, BSFaceGenNiNode * headNode, BGSHeadPart * head, TESNPC * npc);
DEFINE_MEMBER_FN(ApplyMorph, void, 0x0042B400, BSFaceGenNiNode* faceGenNode, BGSHeadPart* headPart, BSFixedString* morphName, float relative);
DEFINE_MEMBER_FN(RegenerateHead, void, 0x0042BCA0, BSFaceGenNiNode * headNode, BGSHeadPart * head, TESNPC * npc);
DEFINE_MEMBER_FN(ApplyMorph, void, 0x0042B5A0, 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 *, 0x0062C670, tArray<MagicItem::EffectItem> * effectArray);
DEFINE_MEMBER_FN(CreateDefensiveEnchantment, EnchantmentItem *, 0x0062C710, tArray<MagicItem::EffectItem> * effectArray);
DEFINE_MEMBER_FN(CreatePoison, void, 0x0062C860, tArray<MagicItem::EffectItem> * effectArray, AlchemyItem ** poison);
DEFINE_MEMBER_FN(CreatePotion, void, 0x0062C7B0, AlchemyItem ** potion, tArray<MagicItem::EffectItem> * effectArray);
DEFINE_MEMBER_FN(ScheduleForDeletion, void, 0x0062CB90, TESForm *);
DEFINE_MEMBER_FN(CreateOffensiveEnchantment, EnchantmentItem *, 0x0062C9F0, tArray<MagicItem::EffectItem> * effectArray);
DEFINE_MEMBER_FN(CreateDefensiveEnchantment, EnchantmentItem *, 0x0062CA90, tArray<MagicItem::EffectItem> * effectArray);
DEFINE_MEMBER_FN(CreatePoison, void, 0x0062CBE0, tArray<MagicItem::EffectItem> * effectArray, AlchemyItem ** poison);
DEFINE_MEMBER_FN(CreatePotion, void, 0x0062CB30, AlchemyItem ** potion, tArray<MagicItem::EffectItem> * effectArray);
DEFINE_MEMBER_FN(ScheduleForDeletion, void, 0x0062CF10, 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, 0x0060FD50, int unk1, UInt32 unk2, const char * name);
DEFINE_MEMBER_FN(Load_Internal, bool, 0x00610490, const char * name, int unk1, UInt32 unk2, UInt32 unk3);
DEFINE_MEMBER_FN(Save_Internal, bool, 0x006100D0, int unk1, UInt32 unk2, const char * name);
DEFINE_MEMBER_FN(Load_Internal, bool, 0x00610810, const char * name, int unk1, UInt32 unk2, UInt32 unk3);

DEFINE_MEMBER_FN(SaveGame_HookTarget, void, 0x00605870, UInt64 *unk0);
DEFINE_MEMBER_FN(LoadGame_HookTarget, bool, 0x00605F80, UInt64 *unk0, UInt32 unk1, UInt32 unk2, void *unk3);
DEFINE_MEMBER_FN(SaveGame_HookTarget, void, 0x00605BF0, UInt64 *unk0);
DEFINE_MEMBER_FN(LoadGame_HookTarget, bool, 0x00606300, UInt64 *unk0, UInt32 unk1, UInt32 unk2, void *unk3);

DEFINE_MEMBER_FN(ProcessEvents_Internal, void, 0x006130C0);
DEFINE_MEMBER_FN(DeleteSavegame, void, 0x0060FCE0, const char * saveName, UInt32 unk1);
DEFINE_MEMBER_FN(ProcessEvents_Internal, void, 0x00613440);
DEFINE_MEMBER_FN(DeleteSavegame, void, 0x00610060, 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.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "GameEvents.h"

// 614D2151B14D0D61E7DA7088CAB85DB111E2E0D3+1B
RelocAddr<_GetEventDispatcherList> GetEventDispatcherList(0x001D5130);
RelocAddr<_GetEventDispatcherList> GetEventDispatcherList(0x001D5140);

//EventDispatcher<BGSFootstepEvent>* g_footstepEventDispatcher = (EventDispatcher<BGSFootstepEvent>*) 0x01B2E9C0;

Expand Down
6 changes: 3 additions & 3 deletions skse64/GameEvents.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ 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, 0x005DBE20, SinkT * eventSink);
DEFINE_MEMBER_FN(AddEventSink_Internal, void, 0x005DBFE0, SinkT * eventSink);
// ??_7BGSProcedureShoutExecState@@6B@ xref +21 last call
DEFINE_MEMBER_FN(RemoveEventSink_Internal, void, 0x0047E080, SinkT * eventSink);
DEFINE_MEMBER_FN(RemoveEventSink_Internal, void, 0x0047E220, SinkT * eventSink);
// FB59C2DDF89F5248DF43230E39A6FECF8C997BA6+466
DEFINE_MEMBER_FN(SendEvent_Internal, void, 0x001C29E0, EventArgT * evn);
DEFINE_MEMBER_FN(SendEvent_Internal, void, 0x001C29F0, EventArgT * evn);

public:

Expand Down
16 changes: 8 additions & 8 deletions skse64/GameExtraData.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@ class InventoryEntryData
void GetEquipItemData(EquipData& stateOut, SInt32 itemId, SInt32 baseCount) const;

MEMBER_FN_PREFIX(InventoryEntryData);
DEFINE_MEMBER_FN(GenerateName, const char *, 0x00223C80);
DEFINE_MEMBER_FN(GetValue, SInt32, 0x00222FD0);
DEFINE_MEMBER_FN(IsOwnedBy, bool, 0x00223DC0, TESForm * actor, bool unk1);
DEFINE_MEMBER_FN(GetSoulLevel, UInt32, 0x00223150);
DEFINE_MEMBER_FN(GenerateName, const char *, 0x00223C90);
DEFINE_MEMBER_FN(GetValue, SInt32, 0x00222FE0);
DEFINE_MEMBER_FN(IsOwnedBy, bool, 0x00223DD0, TESForm * actor, bool unk1);
DEFINE_MEMBER_FN(GetSoulLevel, UInt32, 0x00223160);
};

typedef tList<InventoryEntryData> EntryDataList;
Expand Down Expand Up @@ -98,8 +98,8 @@ class ExtraContainerChanges : public BSExtraData
void GetEquipItemData(InventoryEntryData::EquipData& stateOut, TESForm * item, SInt32 itemId) const;

MEMBER_FN_PREFIX(Data);
DEFINE_MEMBER_FN(SetUniqueID, void, 0x00239A70, BaseExtraList* itemList, TESForm * oldForm, TESForm * newForm);
DEFINE_MEMBER_FN(TransferItemUID, void, 0x00239D20, BaseExtraList * extraList, TESForm * oldForm, TESForm * newForm, UInt32 unk1);
DEFINE_MEMBER_FN(SetUniqueID, void, 0x00239A80, BaseExtraList* itemList, TESForm * oldForm, TESForm * newForm);
DEFINE_MEMBER_FN(TransferItemUID, void, 0x00239D30, BaseExtraList * extraList, TESForm * oldForm, TESForm * newForm, UInt32 unk1);
};

Data * data;
Expand Down Expand Up @@ -552,8 +552,8 @@ class ExtraTextDisplayData : public BSExtraData
static ExtraTextDisplayData* Create();

MEMBER_FN_PREFIX(ExtraTextDisplayData);
DEFINE_MEMBER_FN(SetName_Internal, void, 0x00184130, const char * name);
DEFINE_MEMBER_FN(GenerateName_Internal, const char*, 0x00184000, TESForm * form, float extraHealthValue);
DEFINE_MEMBER_FN(SetName_Internal, void, 0x00184140, const char * name);
DEFINE_MEMBER_FN(GenerateName_Internal, const char*, 0x00184010, TESForm * form, float extraHealthValue);
};
// ExtraAlphaCutoff

Expand Down
18 changes: 9 additions & 9 deletions skse64/GameFormComponents.h
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ class TESDescription : public BaseFormComponent
UInt32 unk0C; // 0C - init'd to FFFFFFFF

MEMBER_FN_PREFIX(TESDescription);
DEFINE_MEMBER_FN(Get, void, 0x001DBBC0, BSString * out, TESForm * parent, UInt32 fieldType);
DEFINE_MEMBER_FN(Get, void, 0x001DBBD0, BSString * out, TESForm * parent, UInt32 fieldType);
};

// 18
Expand Down Expand Up @@ -1064,8 +1064,8 @@ class Biped : public BSIntrusiveRefCounted
UInt32 handle; // 2770
UInt32 unk2774; // 2774

DEFINE_MEMBER_FN_0(UpdateWeightData, void, 0x00212460);
DEFINE_MEMBER_FN_0(DeleteThis, void, 0x00212360);
DEFINE_MEMBER_FN_0(UpdateWeightData, void, 0x00212470);
DEFINE_MEMBER_FN_0(DeleteThis, void, 0x00212370);
};
STATIC_ASSERT(offsetof(Biped, unk10) == 0x10);
STATIC_ASSERT(offsetof(Biped, unk13C0) == 0x13C0);
Expand Down Expand Up @@ -1296,10 +1296,10 @@ class ActorProcessManager
UInt32 pad13C; // 13C

MEMBER_FN_PREFIX(ActorProcessManager);
DEFINE_MEMBER_FN(SetEquipFlag, void, 0x00711C30, UInt8 flags);
DEFINE_MEMBER_FN(UpdateEquipment, void, 0x006E3CE0, Actor * actor);
DEFINE_MEMBER_FN(SetEquipFlag, void, 0x00711FB0, UInt8 flags);
DEFINE_MEMBER_FN(UpdateEquipment, void, 0x006E4060, Actor * actor);
// CDC12817DF3AB5B832348763F433A216BB8A85CA+89
DEFINE_MEMBER_FN(SetDataFlag, void, 0x006EF940, float flag); // Sets a number on the 0x10 object
DEFINE_MEMBER_FN(SetDataFlag, void, 0x006EFCC0, 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, 0x0077AF30, UInt32 actorValue, float * level, float * points, float * pointsMax, UInt32 * unk6);
DEFINE_MEMBER_FN(IncrementLegendary, UInt32, 0x0077B520, UInt32 actorValue);
DEFINE_MEMBER_FN(SetLevel, void, 0x0077B4C0, UInt32 level);
DEFINE_MEMBER_FN(GetSkillData, UInt32, 0x0077B2B0, UInt32 actorValue, float * level, float * points, float * pointsMax, UInt32 * unk6);
DEFINE_MEMBER_FN(IncrementLegendary, UInt32, 0x0077B8A0, UInt32 actorValue);
DEFINE_MEMBER_FN(SetLevel, void, 0x0077B840, UInt32 level);
};

// 10
Expand Down
4 changes: 2 additions & 2 deletions skse64/GameForms.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "GameForms.h"
#include "GameObjects.h"

RelocAddr <_LookupFormByID> LookupFormByID(0x001E00A0);
RelocAddr <_LookupFormByID> LookupFormByID(0x001E00B0);

BGSDefaultObjectManager *BGSDefaultObjectManager::GetSingleton(void)
{
Expand Down Expand Up @@ -66,7 +66,7 @@ void TESForm::CopyFromEx(TESForm * rhsForm)
float GetFormWeight(TESForm *form)
{
// 3894EDBBE3D9FBC367A71D7ABC60B87A407F3E3D+30
static RelocAddr<uintptr_t> GetFormWeight_Address(0x001EDFF0);
static RelocAddr<uintptr_t> GetFormWeight_Address(0x001EE000);

return ((_GetFormWeight)(GetFormWeight_Address.GetUIntPtr())) (form);
}
Expand Down
12 changes: 6 additions & 6 deletions skse64/GameForms.h
Original file line number Diff line number Diff line change
Expand Up @@ -968,9 +968,9 @@ class BGSListForm : public TESForm
UInt32 unk40; // 40

MEMBER_FN_PREFIX(BGSListForm);
DEFINE_MEMBER_FN(AddFormToList, void, 0x00319B90, TESForm * form);
DEFINE_MEMBER_FN(RemoveFormFromList, void, 0x00319D60, TESForm * form);
DEFINE_MEMBER_FN(RevertList, void, 0x00319AB0);
DEFINE_MEMBER_FN(AddFormToList, void, 0x00319D30, TESForm * form);
DEFINE_MEMBER_FN(RemoveFormFromList, void, 0x00319F00, TESForm * form);
DEFINE_MEMBER_FN(RevertList, void, 0x00319C50);

class Visitor
{
Expand Down Expand Up @@ -1701,8 +1701,8 @@ class TESQuest : public BGSStoryManagerTreeForm
UnkArray unk250; // 250

MEMBER_FN_PREFIX(TESQuest);
DEFINE_MEMBER_FN(ForceRefTo, UInt32, 0x003CDC50, UInt32 aliasId, TESObjectREFR * reference);
DEFINE_MEMBER_FN(NewGame_Internal, UInt8, 0x003C9960, UInt8 * unk1, UInt8 unk2);
DEFINE_MEMBER_FN(ForceRefTo, UInt32, 0x003CDDF0, UInt32 aliasId, TESObjectREFR * reference);
DEFINE_MEMBER_FN(NewGame_Internal, UInt8, 0x003C9B00, UInt8 * unk1, UInt8 unk2);

UInt8 NewGame_Hook(UInt8 * unk1, UInt8 unk2);
};
Expand Down Expand Up @@ -2556,7 +2556,7 @@ class TESObjectCELL : public TESForm
UInt64 unk138; // 138

MEMBER_FN_PREFIX(TESObjectCELL);
DEFINE_MEMBER_FN(GetNorthRotation, float, 0x002C2630);
DEFINE_MEMBER_FN(GetNorthRotation, float, 0x002C26F0);
};
STATIC_ASSERT(offsetof(TESObjectCELL, refData) == 0x90);
STATIC_ASSERT(offsetof(TESObjectCELL, objectList) == 0xC0);
Expand Down
Loading

0 comments on commit 38050f1

Please sign in to comment.