runtime 1.12.30 first pass

ianpatt · Jun 10, 2024 · dd60417 · dd60417
1 parent 7c4f898
commit dd60417
Show file tree

Hide file tree

Showing 36 changed files with 7,609 additions and 7,413 deletions.
diff --git a/cmake/versioning.cmake b/cmake/versioning.cmake
@@ -1,10 +1,10 @@
 set(SFSE_VERSION_MAJOR 0)
 set(SFSE_VERSION_MINOR 2)
-set(SFSE_VERSION_PATCH 7)
+set(SFSE_VERSION_PATCH 8)
 
 set(RUNTIME_VERSION_MAJOR 1)
-set(RUNTIME_VERSION_MINOR 11)
-set(RUNTIME_VERSION_PATCH 36)
+set(RUNTIME_VERSION_MINOR 12)
+set(RUNTIME_VERSION_PATCH 30)
 set(RUNTIME_VERSION_TYPE 0)
 
 math(

diff --git a/sfse/GameChargen.cpp b/sfse/GameChargen.cpp
@@ -1,3 +1,3 @@
 #include "sfse/GameChargen.h"
 
-RelocPtr<MenuActor*> TESNPCData::g_actorCheckpoint(0x066698F8);
+RelocPtr<MenuActor*> TESNPCData::g_actorCheckpoint(0x06885E50);
diff --git a/sfse/GameChargen.h b/sfse/GameChargen.h
@@ -17,13 +17,13 @@ class ChargenDataModel : public IDataModel, public BSTSingletonSDM<ChargenDataMo
 
 	static ChargenDataModel* GetSingleton()
 	{
-		RelocPtr<ChargenDataModel*> singleton(0x0665C0C8);
+		RelocPtr<ChargenDataModel*> singleton(0x06878408);
 		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, 0x018668DC, MenuActor*); // unk2 removed in 1.9.51
+	DEFINE_MEMBER_FN_1(Update, void, 0x018A6F6C, MenuActor*); // unk2 removed in 1.9.51
 };
 
 extern RelocPtr<MenuActor*> g_actorCheckpoint;

diff --git a/sfse/GameConsole.cpp b/sfse/GameConsole.cpp
@@ -1,7 +1,7 @@
 #include "sfse/GameConsole.h"
 #include <stdarg.h>
 
-RelocPtr <ConsoleLog*> g_console(0x0665BC50);
+RelocPtr <ConsoleLog*> g_console(0x06877F90);
 
 void Console_Print(const char* fmt, ...)
 {

diff --git a/sfse/GameConsole.h b/sfse/GameConsole.h
@@ -6,7 +6,7 @@
 class ConsoleLog
 {
 public:
-	DEFINE_MEMBER_FN_2(VPrint, void, 0x029177F8, const char* fmt, va_list args);
+	DEFINE_MEMBER_FN_2(VPrint, void, 0x029CD538, const char* fmt, va_list args);
 };
 
 extern RelocPtr <ConsoleLog*> g_console;

diff --git a/sfse/GameData.cpp b/sfse/GameData.cpp
@@ -1,3 +1,3 @@
 #include "sfse/GameData.h"
 
-RelocPtr<MaterialDatabase> g_materialDatabase(0x0622A590 - 0x08);
+RelocPtr<MaterialDatabase> g_materialDatabase(0x06444B80 - 0x08);
diff --git a/sfse/GameData.h b/sfse/GameData.h
@@ -134,7 +134,7 @@ class TESDataHandler :
 
 	static TESDataHandler* GetSingleton()
 	{
-		RelocPtr<TESDataHandler*> singleton(0x06226518);
+		RelocPtr<TESDataHandler*> singleton(0x0642CAC8);
 		return *singleton;
 	}
 };

diff --git a/sfse/GameEvents.h b/sfse/GameEvents.h
diff --git a/sfse/GameForms.cpp b/sfse/GameForms.cpp
@@ -1,4 +1,4 @@
 #include "sfse/GameForms.h"
 
-RelocAddr<TESForm::_GetFormByNumericID> TESForm::GetFormByNumericID(0x0148F340);
-RelocAddr<TESForm::_GetFormByEditorID> TESForm::GetFormByEditorID(0x0148F4A0);
+RelocAddr<TESForm::_GetFormByNumericID> TESForm::GetFormByNumericID(0x014CD5A0);
+RelocAddr<TESForm::_GetFormByEditorID> TESForm::GetFormByEditorID(0x014CD700);
diff --git a/sfse/GameMemory.cpp b/sfse/GameMemory.cpp
@@ -1,6 +1,6 @@
 #include "sfse/GameMemory.h"
 
-RelocAddr<_GetMemoryManager> GetMemoryManager(0x005736B4);
+RelocAddr<_GetMemoryManager> GetMemoryManager(0x0057DD64);
 
 void* Heap_Allocate(size_t size)
 {

diff --git a/sfse/GameMemory.h b/sfse/GameMemory.h
@@ -15,9 +15,9 @@ static_assert(offsetof(ScrapHeap, currentThreadId) == 0x4B8);
 class MemoryManager
 {
 public:
-    DEFINE_MEMBER_FN_3(Allocate, void*, 0x005736D4, size_t size, size_t alignment, bool aligned);
-    DEFINE_MEMBER_FN_2(Free, void, 0x00589710, void* buf, bool aligned);
-    DEFINE_MEMBER_FN_0(GetThreadScrapHeap, ScrapHeap*, 0x007838DC);
+    DEFINE_MEMBER_FN_3(Allocate, void*, 0x0057DD84, size_t size, size_t alignment, bool aligned);
+    DEFINE_MEMBER_FN_2(Free, void, 0x00593DC0, void* buf, bool aligned);
+    DEFINE_MEMBER_FN_0(GetThreadScrapHeap, ScrapHeap*, 0x0078D88C);
 };
 
 using _GetMemoryManager = MemoryManager * (*)();

diff --git a/sfse/GameObjects.h b/sfse/GameObjects.h
@@ -172,8 +172,8 @@ class TESNPC :
     u8 pronoun;  // 448
     u8 pad449[7]; // 449
 
-    DEFINE_MEMBER_FN_1(DeriveGeneticParentAppearance, void, 0x01B09E78, TESNPC* source);
-    DEFINE_MEMBER_FN_1(CopyAppearance, void, 0x01B082B0, TESNPC* source);
+    DEFINE_MEMBER_FN_1(DeriveGeneticParentAppearance, void, 0x01B4CDE8, TESNPC* source);
+    DEFINE_MEMBER_FN_1(CopyAppearance, void, 0x01B4B220, TESNPC* source);
 };
 static_assert(sizeof(TESNPC) == 0x450); // Un-verified after 1.10.31
 static_assert(sizeof(TESNPC::HeadPartData) == 0x28);

diff --git a/sfse/GameRTTI.cpp b/sfse/GameRTTI.cpp
@@ -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(0x035ED490);	// __RTDynamicCast
+RelocAddr <_Runtime_DynamicCast_Internal> Runtime_DynamicCast_Internal(0x037853F0);	// __RTDynamicCast
 
 void* Runtime_DynamicCast(void* srcObj, const void* fromType, const void* toType)
 {