Updated custom map objloading code to match new structure.

src/ObjLoading/Game/T6/CustomMap/LoaderCustomMapT6.cpp

@@ -53,10 +53,10 @@ namespace
     };
 } // namespace
 
-namespace T6
+namespace custom_map
 {
-    std::unique_ptr<AssetCreator<AssetGfxWorld>> CreateCustomMapLoader(MemoryManager& memory, ISearchPath& searchPath, Zone& zone)
+    std::unique_ptr<AssetCreator<AssetGfxWorld>> CreateLoaderT6(MemoryManager& memory, ISearchPath& searchPath, Zone& zone)
     {
         return std::make_unique<CustomMapLoader>(memory, searchPath, zone);
     }
-} // namespace T6
+} // namespace custom_map

src/ObjLoading/Game/T6/CustomMap/LoaderCustomMapT6.h

@@ -7,7 +7,7 @@
 
 #include <memory>
 
-namespace T6
+namespace custom_map
 {
-    std::unique_ptr<AssetCreator<AssetGfxWorld>> CreateCustomMapLoader(MemoryManager& memory, ISearchPath& searchPath, Zone& zone);
+    std::unique_ptr<AssetCreator<T6::AssetGfxWorld>> CreateLoaderT6(MemoryManager& memory, ISearchPath& searchPath, Zone& zone);
-} // namespace T6
+} // namespace custom_map

src/ObjLoading/Game/T6/ObjLoaderT6.cpp

@@ -48,6 +48,7 @@
 #include "Weapon/WeaponRawLoaderT6.h"
 #include "ZBarrier/GdtLoaderZBarrierT6.h"
 #include "ZBarrier/RawLoaderZBarrierT6.h"
+#include "CustomMap/LoaderCustomMapT6.h"
 
 #include <format>
 #include <memory>
@@ -445,8 +446,7 @@ namespace T6
             collection.AddSubAssetCreator(techset::CreateVertexShaderLoaderT6(memory, searchPath));
             collection.AddSubAssetCreator(techset::CreatePixelShaderLoaderT6(memory, searchPath));
 
-            // The Custom Map Loader uses gfxworld as the starting asset
+            collection.AddAssetCreator(custom_map::CreateLoaderT6(memory, searchPath, zone));
-            collection.AddAssetCreator(CreateCustomMapLoader(memory, searchPath, zone));
         }
     } // namespace