Merge branch 'praydog:master' into master

Author: joeyhodge

shared/sdk/ResourceManager.cpp

@@ -55,12 +55,20 @@ ResourceManager* ResourceManager::get() {
     return (ResourceManager*)sdk::get_native_singleton("via.ResourceManager");
 }
 
+// createresource is called in:
+// via.Folder.activate
+// via.Prefab.duplicate
+// via.Prefab.Clone
+// via.Prefab.set_Path
+// via.prefab.set_Standby
 sdk::Resource* ResourceManager::create_resource(void* type_info, std::wstring_view name) {
     update_pointers();
 
     return s_create_resource_fn(this, type_info, name.data());
 }
 
+// This one is a bit harder but there are a few functions called at the bottom of
+// createResource that are called in create_userdata
 intrusive_ptr<sdk::ManagedObject> ResourceManager::create_userdata(void* type_info, std::wstring_view name) {
     update_pointers();
 
@@ -119,7 +127,8 @@ void ResourceManager::update_pointers() {
             // since they both have the same pattern at the start of the function
             const auto valid_patterns = {
                 "66 83 F8 40 75 ? C6",
-                "66 83 F8 40 75 ? 48"
+                "66 83 F8 40 75 ? 48",
+                "66 41 83 39 40" // DD2+
             };
 
             bool found = false;

shared/sdk/ResourceManager.hpp

@@ -29,6 +29,7 @@ class Resource {
 class ResourceManager {
 public:
     static ResourceManager* get();
+    static void update_pointers();
 
 public:
     sdk::Resource* create_resource(void* type_info, std::wstring_view name);
@@ -49,7 +50,6 @@ class ResourceManager {
 private:
     friend class sdk::Resource;
 
-    static void update_pointers();
     static sdk::Resource* (*s_create_resource_fn)(ResourceManager*, void*, const wchar_t*);
     static uintptr_t s_create_resource_reference;
 

shared/sdk/SDK.cpp

@@ -3,6 +3,7 @@
 
 #include "RETypes.hpp"
 #include "REGlobals.hpp"
+#include "ResourceManager.hpp"
 
 #include "SDK.hpp"
 
@@ -20,5 +21,7 @@ void initialize_sdk() {
 
     utility::re_managed_object::detail::resolve_add_ref();
     utility::re_managed_object::detail::resolve_release();
+
+    sdk::ResourceManager::update_pointers();
 }
 }