Merge branch 'main' into carbon

Author: MaxHwoy

.gitignore

@@ -57,6 +57,9 @@ nunit-*.xml
 [Rr]eleasePS/
 dlldata.c
 
+# Version Files
+version.hpp
+
 # Benchmark Results
 BenchmarkDotNet.Artifacts/
 

src/hyperlib/streamer/sections.cpp

@@ -502,7 +502,9 @@ namespace hyper
         {
             const group_info& info = visible_section::manager::group_info_table[i];
 
-            if (string::length(info.selection_set_name) == length && !::_strnicmp(info.selection_set_name, group_name, length))
+            size_t namesz = string::length(info.selection_set_name);
+
+            if (namesz <= length && !::_strnicmp(info.selection_set_name, group_name, namesz))
             {
                 return &info;
             }

src/hyperlib/version.hpp

@@ -50,6 +50,17 @@ namespace hyper
         }
     }
 
+    void world::init_topology_and_scenery_groups()
+    {
+        for (const char* group : world::permanent_scenery_groups)
+        {
+            if (scenery::group::find(hashing::bin(group)) != nullptr)
+            {
+                world::enable_barrier_scenery_group(group, false);
+            }
+        }
+    }
+
     void world::redo_topology_and_scenery_groups()
     {
         track_path::manager::instance.disable_all_barriers();
@@ -58,9 +69,6 @@ namespace hyper
 
         world::disable_all_scenery_groups();
 
-        if (scenery::group::find(hashing::bin_const("SCENERY_GROUP_DOOR")) != nullptr)
-        {
-            world::enable_barrier_scenery_group("SCENERY_GROUP_DOOR", false);
-        }
+        world::init_topology_and_scenery_groups();
     }
 }

src/hyperlib/world/world.cpp

@@ -18,6 +18,14 @@ namespace hyper
 
         static void disable_all_scenery_groups();
 
+        static void init_topology_and_scenery_groups();
+
         static void redo_topology_and_scenery_groups();
+
+    private:
+        static inline const char* permanent_scenery_groups[] =
+        {
+            "SCENERY_GROUP_DOOR",
+        };
     };
 }

src/hyperlib/world/world.hpp

@@ -3,6 +3,64 @@
 
 namespace hyper
 {
+    __declspec(naked) void detour_setup_topology_and_scenery()
+    {
+        __asm
+        {
+            // [esp + 0x00] is 'return address'
+
+            // esp is auto-managed, non-incremental
+            // ebp is auto-managed, restored on function return
+
+            push eax; // 'return address' is now at [esp + 0x04]
+            push ebx; // 'return address' is now at [esp + 0x08]
+            push ecx; // 'return address' is now at [esp + 0x0C]
+            push edx; // 'return address' is now at [esp + 0x10]
+            push esi; // 'return address' is now at [esp + 0x14]
+            push edi; // 'return address' is now at [esp + 0x18]
+
+            call world::init_topology_and_scenery_groups; // call custom init_topology_and_scenery_groups
+
+            pop edi; // restore saved register
+            pop esi; // restore saved register
+            pop edx; // restore saved register
+            pop ecx; // restore saved register
+            pop ebx; // restore saved register
+            pop eax; // restore saved register
+
+            retn; // return immediately to caller function, not back to SetupTopologyAndScenery
+        }
+    }
+
+    __declspec(naked) void detour_init_topology_and_scenery_groups()
+    {
+        __asm
+        {
+            // [esp + 0x00] is 'return address'
+
+            // esp is auto-managed, non-incremental
+            // ebp is auto-managed, restored on function return
+
+            push eax; // 'return address' is now at [esp + 0x04]
+            push ebx; // 'return address' is now at [esp + 0x08]
+            push ecx; // 'return address' is now at [esp + 0x0C]
+            push edx; // 'return address' is now at [esp + 0x10]
+            push esi; // 'return address' is now at [esp + 0x14]
+            push edi; // 'return address' is now at [esp + 0x18]
+
+            call world::init_topology_and_scenery_groups; // call custom init_topology_and_scenery_groups
+
+            pop edi; // restore saved register
+            pop esi; // restore saved register
+            pop edx; // restore saved register
+            pop ecx; // restore saved register
+            pop ebx; // restore saved register
+            pop eax; // restore saved register
+
+            retn; // return immediately to caller function, not back to InitTopologyAndSceneryGroups
+        }
+    }
+
     __declspec(naked) void detour_redo_topology_and_scenery_groups()
     {
         __asm
@@ -34,6 +92,12 @@ namespace hyper
 
     void world_patches::init()
     {
+        // SetupTopologyAndScenery
+        hook::jump(0x007990A0, &detour_setup_topology_and_scenery);
+
+        // InitTopologyAndSceneryGroups
+        hook::jump(0x006A8A80, &detour_init_topology_and_scenery_groups);
+
         // RedoTopologyAndSceneryGroups
         hook::jump(0x006A8AD0, &detour_redo_topology_and_scenery_groups);
     }