Skip to content

Commit

Permalink
address/version update for 1.9.51
Browse files Browse the repository at this point in the history
  • Loading branch information
ianpatt committed Jan 31, 2024
1 parent 886fb37 commit 4cde620
Show file tree
Hide file tree
Showing 33 changed files with 7,393 additions and 7,379 deletions.
6 changes: 3 additions & 3 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 1)
set(SFSE_VERSION_PATCH 2)

set(RUNTIME_VERSION_MAJOR 1)
set(RUNTIME_VERSION_MINOR 8)
set(RUNTIME_VERSION_PATCH 88)
set(RUNTIME_VERSION_MINOR 9)
set(RUNTIME_VERSION_PATCH 51)
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(0x059784B8);
RelocPtr<ChargenDataModel*> singleton(0x0598E938);
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_2(Update, void, 0x01895CC4, TESNPC*, void** unk2); // Unk2 looks like somekind of restore point, is usually CharGenMenu+0x2D0
DEFINE_MEMBER_FN_1(Update, void, 0x01895FA4, 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(0x05978050);
RelocPtr <ConsoleLog*> g_console(0x0598E4D0);

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, 0x02894E68, const char* fmt, va_list args);
DEFINE_MEMBER_FN_2(VPrint, void, 0x028A1408, 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(0x05549E90 - 0x08);
RelocPtr<MaterialDatabase> g_materialDatabase(0x0555ED30 - 0x08);
4 changes: 2 additions & 2 deletions 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(0x05545EE8);
RelocPtr<TESDataHandler*> singleton(0x0555AD78);
return *singleton;
}
};
Expand All @@ -146,4 +146,4 @@ struct MaterialDatabase
BSTHashMap<BSFixedString, void*> fullMap; // This is probably a set, every value is 0
};

extern RelocPtr<MaterialDatabase> g_materialDatabase;
extern RelocPtr<MaterialDatabase> g_materialDatabase;
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(0x014D9B00);
RelocAddr<TESForm::_GetFormByEditorID> TESForm::GetFormByEditorID(0x014D9C5C);
RelocAddr<TESForm::_GetFormByNumericID> TESForm::GetFormByNumericID(0x014D97D0);
RelocAddr<TESForm::_GetFormByEditorID> TESForm::GetFormByEditorID(0x014D992C);
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(0x00547CE4);
RelocAddr<_GetMemoryManager> GetMemoryManager(0x00547FD4);

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*, 0x00547D04, size_t size, size_t alignment, bool aligned);
DEFINE_MEMBER_FN_2(Free, void, 0x0055C164, void* buf, bool aligned);
DEFINE_MEMBER_FN_0(GetThreadScrapHeap, ScrapHeap*, 0x00839100);
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);
};

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, 0x01B2E358, TESNPC* source);
DEFINE_MEMBER_FN_1(CopyAppearance, void, 0x01B2C790, TESNPC* source);
DEFINE_MEMBER_FN_1(DeriveGeneticParentAppearance, void, 0x01B30128, TESNPC* source);
DEFINE_MEMBER_FN_1(CopyAppearance, void, 0x01B2E560, 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(0x03518090); // __RTDynamicCast
RelocAddr <_Runtime_DynamicCast_Internal> Runtime_DynamicCast_Internal(0x03537500); // __RTDynamicCast

void* Runtime_DynamicCast(void* srcObj, const void* fromType, const void* toType)
{
Expand Down
4 changes: 4 additions & 0 deletions sfse/GameRTTI.h
Original file line number Diff line number Diff line change
Expand Up @@ -2030,6 +2030,7 @@ extern const void * RTTI_CreationRendererPrivate__ParticlesMainHalfResRenderPass
extern const void * RTTI_CreationRendererPrivate__ParticlesMomentBasedOITRenderMomentsRenderPass;
extern const void * RTTI_CreationRendererPrivate__ParticlesMomentBasedOITRenderTransparencyRenderPass;
extern const void * RTTI_CreationRendererPrivate__ParticlesRenderPass;
extern const void * RTTI_CreationRendererPrivate__PauseMenuExitedEventHandler;
extern const void * RTTI_CreationRendererPrivate__PointCloudCullingRenderPass;
extern const void * RTTI_CreationRendererPrivate__PointCloudDrawRenderPass;
extern const void * RTTI_CreationRendererPrivate__PointCloudEventHandler;
Expand Down Expand Up @@ -2172,6 +2173,8 @@ extern const void * RTTI_CreationRendererPrivate__StarmapGravityWavesRenderPass;
extern const void * RTTI_CreationRendererPrivate__StarmapOrbitsEventHandler;
extern const void * RTTI_CreationRendererPrivate__StarmapOrbitsRenderPass;
extern const void * RTTI_CreationRendererPrivate__SubmitAndPresentThread;
extern const void * RTTI_CreationRendererPrivate__SunDiskRenderPass;
extern const void * RTTI_CreationRendererPrivate__SunDiskSkyCubemapRenderPass;
extern const void * RTTI_CreationRendererPrivate__SwapChainEventHandler;
extern const void * RTTI_CreationRendererPrivate__TemporalAA_idTech7RenderPass;
extern const void * RTTI_CreationRendererPrivate__TerrainClipmapAndMIMRenderPass;
Expand Down Expand Up @@ -5737,6 +5740,7 @@ extern const void * RTTI_WorkshopEngine__PlaceOutpostEvent;
extern const void * RTTI_WorkshopEngine__PreviewColorsEvent;
extern const void * RTTI_WorkshopEngine__RemoveItemEvent;
extern const void * RTTI_WorkshopEngine__RemoveOutpostEvent;
extern const void * RTTI_WorkshopEngine__RemoveSingleWorkshopItemEvent;
extern const void * RTTI_WorkshopEngine__RemoveWorkshopItemsEvent;
extern const void * RTTI_WorkshopEngine__RequestRepairItemEvent;
extern const void * RTTI_WorkshopEngine__ResetColorsToDefaultEvent;
Expand Down
Loading

0 comments on commit 4cde620

Please sign in to comment.