Skip to content

Commit

Permalink
address/version update for 1.9.67
Browse files Browse the repository at this point in the history
  • Loading branch information
ianpatt committed Feb 21, 2024
1 parent 4cde620 commit b7aaeee
Show file tree
Hide file tree
Showing 33 changed files with 7,400 additions and 7,382 deletions.
4 changes: 2 additions & 2 deletions cmake/versioning.cmake
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
set(SFSE_VERSION_MAJOR 0)
set(SFSE_VERSION_MINOR 2)
set(SFSE_VERSION_PATCH 2)
set(SFSE_VERSION_PATCH 3)

set(RUNTIME_VERSION_MAJOR 1)
set(RUNTIME_VERSION_MINOR 9)
set(RUNTIME_VERSION_PATCH 51)
set(RUNTIME_VERSION_PATCH 67)
set(RUNTIME_VERSION_TYPE 0)

math(
Expand Down
4 changes: 2 additions & 2 deletions sfse/GameChargen.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ class ChargenDataModel : public IDataModel, public BSTSingletonSDM<ChargenDataMo

static ChargenDataModel* GetSingleton()
{
RelocPtr<ChargenDataModel*> singleton(0x0598E938);
RelocPtr<ChargenDataModel*> singleton(0x06581DF8);
return *singleton;
}

// Contains main UI data model wrappers, decode these later
// This function will pull data from the TESNPC into this wrapper
DEFINE_MEMBER_FN_1(Update, void, 0x01895FA4, TESNPC*); // unk2 removed in 1.9.51
DEFINE_MEMBER_FN_1(Update, void, 0x018CB844, TESNPC*); // unk2 removed in 1.9.51
};
}

Expand Down
2 changes: 1 addition & 1 deletion sfse/GameConsole.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "sfse/GameConsole.h"
#include <stdarg.h>

RelocPtr <ConsoleLog*> g_console(0x0598E4D0);
RelocPtr <ConsoleLog*> g_console(0x06581990);

void Console_Print(const char* fmt, ...)
{
Expand Down
2 changes: 1 addition & 1 deletion sfse/GameConsole.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
class ConsoleLog
{
public:
DEFINE_MEMBER_FN_2(VPrint, void, 0x028A1408, const char* fmt, va_list args);
DEFINE_MEMBER_FN_2(VPrint, void, 0x028D8AD8, const char* fmt, va_list args);
};

extern RelocPtr <ConsoleLog*> g_console;
Expand Down
2 changes: 1 addition & 1 deletion sfse/GameData.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#include "sfse/GameData.h"

RelocPtr<MaterialDatabase> g_materialDatabase(0x0555ED30 - 0x08);
RelocPtr<MaterialDatabase> g_materialDatabase(0x06152120 - 0x08);
2 changes: 1 addition & 1 deletion sfse/GameData.h
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ class TESDataHandler :

static TESDataHandler* GetSingleton()
{
RelocPtr<TESDataHandler*> singleton(0x0555AD78);
RelocPtr<TESDataHandler*> singleton(0x0614E178);
return *singleton;
}
};
Expand Down
1,398 changes: 699 additions & 699 deletions sfse/GameEvents.h

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions sfse/GameForms.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "sfse/GameForms.h"

RelocAddr<TESForm::_GetFormByNumericID> TESForm::GetFormByNumericID(0x014D97D0);
RelocAddr<TESForm::_GetFormByEditorID> TESForm::GetFormByEditorID(0x014D992C);
RelocAddr<TESForm::_GetFormByNumericID> TESForm::GetFormByNumericID(0x0150ECC0);
RelocAddr<TESForm::_GetFormByEditorID> TESForm::GetFormByEditorID(0x0150EE1C);
2 changes: 1 addition & 1 deletion sfse/GameMemory.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "sfse/GameMemory.h"

RelocAddr<_GetMemoryManager> GetMemoryManager(0x00547FD4);
RelocAddr<_GetMemoryManager> GetMemoryManager(0x005480E4);

void* Heap_Allocate(size_t size)
{
Expand Down
6 changes: 3 additions & 3 deletions sfse/GameMemory.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ static_assert(offsetof(ScrapHeap, currentThreadId) == 0x4B8);
class MemoryManager
{
public:
DEFINE_MEMBER_FN_3(Allocate, void*, 0x00547FF4, size_t size, size_t alignment, bool aligned);
DEFINE_MEMBER_FN_2(Free, void, 0x0054FDE4, void* buf, bool aligned);
DEFINE_MEMBER_FN_0(GetThreadScrapHeap, ScrapHeap*, 0x00834900);
DEFINE_MEMBER_FN_3(Allocate, void*, 0x00548104, size_t size, size_t alignment, bool aligned);
DEFINE_MEMBER_FN_2(Free, void, 0x0054FEF4, void* buf, bool aligned);
DEFINE_MEMBER_FN_0(GetThreadScrapHeap, ScrapHeap*, 0x00834A10);
};

using _GetMemoryManager = MemoryManager * (*)();
Expand Down
4 changes: 2 additions & 2 deletions sfse/GameObjects.h
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ class TESNPC :
u8 pronoun; // 448
u8 pad449[7]; // 449

DEFINE_MEMBER_FN_1(DeriveGeneticParentAppearance, void, 0x01B30128, TESNPC* source);
DEFINE_MEMBER_FN_1(CopyAppearance, void, 0x01B2E560, TESNPC* source);
DEFINE_MEMBER_FN_1(DeriveGeneticParentAppearance, void, 0x01B665E8, TESNPC* source);
DEFINE_MEMBER_FN_1(CopyAppearance, void, 0x01B64A20, TESNPC* source);
};
static_assert(sizeof(TESNPC) == 0x450);
static_assert(sizeof(TESNPC::HeadPartData) == 0x28);
Expand Down
2 changes: 1 addition & 1 deletion sfse/GameRTTI.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

typedef void* (*_Runtime_DynamicCast_Internal)(void* srcObj, u32 arg1, const void* fromType, const void* toType, u32 arg4);

RelocAddr <_Runtime_DynamicCast_Internal> Runtime_DynamicCast_Internal(0x03537500); // __RTDynamicCast
RelocAddr <_Runtime_DynamicCast_Internal> Runtime_DynamicCast_Internal(0x03576950); // __RTDynamicCast

void* Runtime_DynamicCast(void* srcObj, const void* fromType, const void* toType)
{
Expand Down
9 changes: 8 additions & 1 deletion sfse/GameRTTI.h
Original file line number Diff line number Diff line change
Expand Up @@ -283,12 +283,14 @@ extern const void * RTTI_BGSLODStates__Geometry__Base;
extern const void * RTTI_BGSLODStates__Geometry__DeferredDetach;
extern const void * RTTI_BGSLODStates__Geometry__DeferredDetachComplete;
extern const void * RTTI_BGSLODStates__Geometry__Detached;
extern const void * RTTI_BGSLODStates__Geometry__Invisible;
extern const void * RTTI_BGSLODStates__Geometry__Loaded;
extern const void * RTTI_BGSLODStates__Geometry__Loading;
extern const void * RTTI_BGSLODStates__Geometry__Prepared;
extern const void * RTTI_BGSLODStates__Geometry__Preparing;
extern const void * RTTI_BGSLODStates__Geometry__Reset;
extern const void * RTTI_BGSLODStates__Geometry__Unloaded;
extern const void * RTTI_BGSLODStates__Geometry__Visible;
extern const void * RTTI_BGSLODStates__Node__Active;
extern const void * RTTI_BGSLODStates__Node__Base;
extern const void * RTTI_BGSLODStates__Node__Fading;
Expand Down Expand Up @@ -1866,6 +1868,9 @@ extern const void * RTTI_CreationRendererPrivate__EpipolarSamplingRenderPass;
extern const void * RTTI_CreationRendererPrivate__EpipolarSamplingRenderSliceEndPointsRenderPass;
extern const void * RTTI_CreationRendererPrivate__FSR2ProduceInputsRenderPass;
extern const void * RTTI_CreationRendererPrivate__FSR2UpscaleRenderPass;
extern const void * RTTI_CreationRendererPrivate__FSR3FrameInterpolationRenderPass;
extern const void * RTTI_CreationRendererPrivate__FSR3ProduceUIInputRenderPass;
extern const void * RTTI_CreationRendererPrivate__FSR3UpscaleRenderPass;
extern const void * RTTI_CreationRendererPrivate__FaceCustomizationMipChainRenderPass;
extern const void * RTTI_CreationRendererPrivate__FaceCustomizationRenderPass;
extern const void * RTTI_CreationRendererPrivate__FillCullingDataRenderPass;
Expand All @@ -1886,6 +1891,7 @@ extern const void * RTTI_CreationRendererPrivate__ForwardBlendedMainHalfResRende
extern const void * RTTI_CreationRendererPrivate__ForwardBlendedRenderPass;
extern const void * RTTI_CreationRendererPrivate__ForwardRenderPass;
extern const void * RTTI_CreationRendererPrivate__FrameInitRenderPass;
extern const void * RTTI_CreationRendererPrivate__FrameInterpolationSubGraph;
extern const void * RTTI_CreationRendererPrivate__FrameRenderGraph;
extern const void * RTTI_CreationRendererPrivate__FrameSetupRenderPass;
extern const void * RTTI_CreationRendererPrivate__FullScreenBlurCompositeRenderPass;
Expand Down Expand Up @@ -2242,6 +2248,7 @@ extern const void * RTTI_CreationRendererPrivate__WaterRenderPass;
extern const void * RTTI_CreationRendererPrivate__WetnessOcclusionMaskRenderPass;
extern const void * RTTI_CreationRendererPrivate__WindowEventHandler;
extern const void * RTTI_CreationRendererPrivate__WorldCell;
extern const void * RTTI_CreationRendererPrivate__XeSSUpscaleRenderPass;
extern const void * RTTI_CreationRenderer__ImageCaptureExportToFileNode;
extern const void * RTTI_CreationRenderer__MaterialInstance__TextureVisitor;
extern const void * RTTI_CreationRenderer__Messaging__MessageProcessor;
Expand Down Expand Up @@ -2697,6 +2704,7 @@ extern const void * RTTI_FootIKNodeInstance;
extern const void * RTTI_ForceWeaponFireHandler;
extern const void * RTTI_FormStreamerLoadStorageWrapper;
extern const void * RTTI_FormStreamerSaveStorageWrapper;
extern const void * RTTI_FrameInterpolationSwapChainDX12;
extern const void * RTTI_FreeAdvancedCameraState;
extern const void * RTTI_FreeFlyCameraState;
extern const void * RTTI_FreeTetheredCameraState;
Expand Down Expand Up @@ -3100,7 +3108,6 @@ extern const void * RTTI_LoadGameMagicCasterVisitor;
extern const void * RTTI_LoadSavePanelDataModel;
extern const void * RTTI_LoadSavePanelDataModel__LoadSavePanelEventShuttle;
extern const void * RTTI_LoadScreenRenderingEventHandler;
extern const void * RTTI_LoadStorageWrapperBase;
extern const void * RTTI_LoadTraversalSubgraphDataFunctor;
extern const void * RTTI_LoadedAreaBound;
extern const void * RTTI_LoadedCellDB__IStateControl;
Expand Down
Loading

0 comments on commit b7aaeee

Please sign in to comment.