Merge pull request #291 from Laupetin/refactor/game-based-interfaces

refactor: interfaces with game implementations

src/Common/Game/IGame.h

@@ -36,6 +36,7 @@ public:
     IGame& operator=(const IGame& other) = default;
     IGame& operator=(IGame&& other) noexcept = default;
 
+    virtual GameId GetId() = 0;
     virtual std::string GetFullName() = 0;
     virtual std::string GetShortName() = 0;
     virtual void AddZone(Zone* zone) = 0;

src/Common/Game/IW3/GameIW3.cpp

@@ -8,6 +8,11 @@ using namespace IW3;
 
 GameIW3 g_GameIW3;
 
+GameId GameIW3::GetId()
+{
+    return GameId::IW3;
+}
+
 std::string GameIW3::GetFullName()
 {
     return "Call Of Duty 4: Modern Warfare";

src/Common/Game/IW3/GameIW3.h

@@ -1,17 +1,19 @@
 #pragma once
 #include "Game/IGame.h"
 
-class GameIW3 : public IGame
+class GameIW3 final : public IGame
 {
-    std::vector<Zone*> m_zones;
-
 public:
+    GameId GetId() override;
     std::string GetFullName() override;
     std::string GetShortName() override;
     void AddZone(Zone* zone) override;
     void RemoveZone(Zone* zone) override;
     std::vector<Zone*> GetZones() override;
     std::vector<GameLanguagePrefix> GetLanguagePrefixes() override;
+
+private:
+    std::vector<Zone*> m_zones;
 };
 
 extern GameIW3 g_GameIW3;

src/Common/Game/IW4/GameIW4.cpp

@@ -8,6 +8,11 @@ using namespace IW4;
 
 GameIW4 g_GameIW4;
 
+GameId GameIW4::GetId()
+{
+    return GameId::IW4;
+}
+
 std::string GameIW4::GetFullName()
 {
     return "Call Of Duty: Modern Warfare 2";

src/Common/Game/IW4/GameIW4.h

@@ -1,17 +1,19 @@
 #pragma once
 #include "Game/IGame.h"
 
-class GameIW4 : public IGame
+class GameIW4 final : public IGame
 {
-    std::vector<Zone*> m_zones;
-
 public:
+    GameId GetId() override;
     std::string GetFullName() override;
     std::string GetShortName() override;
     void AddZone(Zone* zone) override;
     void RemoveZone(Zone* zone) override;
     std::vector<Zone*> GetZones() override;
     std::vector<GameLanguagePrefix> GetLanguagePrefixes() override;
+
+private:
+    std::vector<Zone*> m_zones;
 };
 
 extern GameIW4 g_GameIW4;

src/Common/Game/IW5/GameIW5.cpp

@@ -8,6 +8,11 @@ using namespace IW5;
 
 GameIW5 g_GameIW5;
 
+GameId GameIW5::GetId()
+{
+    return GameId::IW5;
+}
+
 std::string GameIW5::GetFullName()
 {
     return "Call Of Duty: Modern Warfare 3";

src/Common/Game/IW5/GameIW5.h

@@ -1,17 +1,19 @@
 #pragma once
 #include "Game/IGame.h"
 
-class GameIW5 : public IGame
+class GameIW5 final : public IGame
 {
-    std::vector<Zone*> m_zones;
-
 public:
+    GameId GetId() override;
     std::string GetFullName() override;
     std::string GetShortName() override;
     void AddZone(Zone* zone) override;
     void RemoveZone(Zone* zone) override;
     std::vector<Zone*> GetZones() override;
     std::vector<GameLanguagePrefix> GetLanguagePrefixes() override;
+
+private:
+    std::vector<Zone*> m_zones;
 };
 
 extern GameIW5 g_GameIW5;

src/Common/Game/T5/GameT5.cpp

@@ -8,6 +8,11 @@ using namespace T5;
 
 GameT5 g_GameT5;
 
+GameId GameT5::GetId()
+{
+    return GameId::T5;
+}
+
 std::string GameT5::GetFullName()
 {
     return "Call Of Duty: Black Ops";

src/Common/Game/T5/GameT5.h

@@ -1,17 +1,19 @@
 #pragma once
 #include "Game/IGame.h"
 
-class GameT5 : public IGame
+class GameT5 final : public IGame
 {
-    std::vector<Zone*> m_zones;
-
 public:
+    GameId GetId() override;
     std::string GetFullName() override;
     std::string GetShortName() override;
     void AddZone(Zone* zone) override;
     void RemoveZone(Zone* zone) override;
     std::vector<Zone*> GetZones() override;
     std::vector<GameLanguagePrefix> GetLanguagePrefixes() override;
+
+private:
+    std::vector<Zone*> m_zones;
 };
 
 extern GameT5 g_GameT5;

src/Common/Game/T6/GameT6.cpp

@@ -8,6 +8,11 @@ using namespace T6;
 
 GameT6 g_GameT6;
 
+GameId GameT6::GetId()
+{
+    return GameId::T6;
+}
+
 std::string GameT6::GetFullName()
 {
     return "Call Of Duty: Black Ops II";

src/Common/Game/T6/GameT6.h

@@ -1,17 +1,19 @@
 #pragma once
 #include "Game/IGame.h"
 
-class GameT6 : public IGame
+class GameT6 final : public IGame
 {
-    std::vector<Zone*> m_zones;
-
 public:
+    GameId GetId() override;
     std::string GetFullName() override;
     std::string GetShortName() override;
     void AddZone(Zone* zone) override;
     void RemoveZone(Zone* zone) override;
     std::vector<Zone*> GetZones() override;
     std::vector<GameLanguagePrefix> GetLanguagePrefixes() override;
+
+private:
+    std::vector<Zone*> m_zones;
 };
 
 extern GameT6 g_GameT6;

src/Linker/Game/IW3/ZoneCreatorIW3.cpp

@@ -3,6 +3,7 @@
 #include "AssetLoading/AssetLoadingContext.h"
 #include "Game/IW3/GameAssetPoolIW3.h"
 #include "Game/IW3/GameIW3.h"
+#include "IObjLoader.h"
 #include "ObjLoading.h"
 #include "Utils/StringUtils.h"
 
@@ -53,13 +54,14 @@ std::unique_ptr<Zone> ZoneCreator::CreateZoneForDefinition(ZoneCreationContext&
     const auto assetLoadingContext = std::make_unique<AssetLoadingContext>(*zone, *context.m_asset_search_path, CreateGdtList(context));
     ApplyIgnoredAssets(context, *assetLoadingContext);
 
+    const auto* objLoader = IObjLoader::GetObjLoaderForGame(GameId::IW3);
     for (const auto& assetEntry : context.m_definition->m_assets)
     {
-        if (!ObjLoading::LoadAssetForZone(*assetLoadingContext, assetEntry.m_asset_type, assetEntry.m_asset_name))
+        if (!objLoader->LoadAssetForZone(*assetLoadingContext, assetEntry.m_asset_type, assetEntry.m_asset_name))
             return nullptr;
     }
 
-    ObjLoading::FinalizeAssetsForZone(*assetLoadingContext);
+    objLoader->FinalizeAssetsForZone(*assetLoadingContext);
 
     return zone;
 }

src/Linker/Game/IW4/ZoneCreatorIW4.cpp

@@ -2,6 +2,7 @@
 
 #include "Game/IW4/GameAssetPoolIW4.h"
 #include "Game/IW4/GameIW4.h"
+#include "IObjLoader.h"
 #include "ObjLoading.h"
 #include "Utils/StringUtils.h"
 
@@ -52,13 +53,14 @@ std::unique_ptr<Zone> ZoneCreator::CreateZoneForDefinition(ZoneCreationContext&
     const auto assetLoadingContext = std::make_unique<AssetLoadingContext>(*zone, *context.m_asset_search_path, CreateGdtList(context));
     ApplyIgnoredAssets(context, *assetLoadingContext);
 
+    const auto* objLoader = IObjLoader::GetObjLoaderForGame(GameId::IW4);
     for (const auto& assetEntry : context.m_definition->m_assets)
     {
-        if (!ObjLoading::LoadAssetForZone(*assetLoadingContext, assetEntry.m_asset_type, assetEntry.m_asset_name))
+        if (!objLoader->LoadAssetForZone(*assetLoadingContext, assetEntry.m_asset_type, assetEntry.m_asset_name))
             return nullptr;
     }
 
-    ObjLoading::FinalizeAssetsForZone(*assetLoadingContext);
+    objLoader->FinalizeAssetsForZone(*assetLoadingContext);
 
     return zone;
 }

src/Linker/Game/IW5/ZoneCreatorIW5.cpp

@@ -2,6 +2,7 @@
 
 #include "Game/IW5/GameAssetPoolIW5.h"
 #include "Game/IW5/GameIW5.h"
+#include "IObjLoader.h"
 #include "ObjLoading.h"
 #include "Utils/StringUtils.h"
 
@@ -52,13 +53,14 @@ std::unique_ptr<Zone> ZoneCreator::CreateZoneForDefinition(ZoneCreationContext&
     const auto assetLoadingContext = std::make_unique<AssetLoadingContext>(*zone, *context.m_asset_search_path, CreateGdtList(context));
     ApplyIgnoredAssets(context, *assetLoadingContext);
 
+    const auto* objLoader = IObjLoader::GetObjLoaderForGame(GameId::IW5);
     for (const auto& assetEntry : context.m_definition->m_assets)
     {
-        if (!ObjLoading::LoadAssetForZone(*assetLoadingContext, assetEntry.m_asset_type, assetEntry.m_asset_name))
+        if (!objLoader->LoadAssetForZone(*assetLoadingContext, assetEntry.m_asset_type, assetEntry.m_asset_name))
             return nullptr;
     }
 
-    ObjLoading::FinalizeAssetsForZone(*assetLoadingContext);
+    objLoader->FinalizeAssetsForZone(*assetLoadingContext);
 
     return zone;
 }

src/Linker/Game/T5/ZoneCreatorT5.cpp

@@ -3,6 +3,7 @@
 #include "AssetLoading/AssetLoadingContext.h"
 #include "Game/T5/GameAssetPoolT5.h"
 #include "Game/T5/GameT5.h"
+#include "IObjLoader.h"
 #include "ObjLoading.h"
 #include "Utils/StringUtils.h"
 
@@ -53,13 +54,14 @@ std::unique_ptr<Zone> ZoneCreator::CreateZoneForDefinition(ZoneCreationContext&
     const auto assetLoadingContext = std::make_unique<AssetLoadingContext>(*zone, *context.m_asset_search_path, CreateGdtList(context));
     ApplyIgnoredAssets(context, *assetLoadingContext);
 
+    const auto* objLoader = IObjLoader::GetObjLoaderForGame(GameId::T5);
     for (const auto& assetEntry : context.m_definition->m_assets)
     {
-        if (!ObjLoading::LoadAssetForZone(*assetLoadingContext, assetEntry.m_asset_type, assetEntry.m_asset_name))
+        if (!objLoader->LoadAssetForZone(*assetLoadingContext, assetEntry.m_asset_type, assetEntry.m_asset_name))
             return nullptr;
     }
 
-    ObjLoading::FinalizeAssetsForZone(*assetLoadingContext);
+    objLoader->FinalizeAssetsForZone(*assetLoadingContext);
 
     return zone;
 }

src/Linker/Game/T6/ZoneCreatorT6.cpp

@@ -4,6 +4,7 @@
 #include "Game/T6/GameAssetPoolT6.h"
 #include "Game/T6/GameT6.h"
 #include "Game/T6/T6.h"
+#include "IObjLoader.h"
 #include "ObjLoading.h"
 #include "Utils/StringUtils.h"
 
@@ -106,13 +107,14 @@ std::unique_ptr<Zone> ZoneCreator::CreateZoneForDefinition(ZoneCreationContext&
 
     HandleMetadata(zone.get(), context);
 
+    const auto* objLoader = IObjLoader::GetObjLoaderForGame(GameId::T6);
     for (const auto& assetEntry : context.m_definition->m_assets)
     {
-        if (!ObjLoading::LoadAssetForZone(*assetLoadingContext, assetEntry.m_asset_type, assetEntry.m_asset_name))
+        if (!objLoader->LoadAssetForZone(*assetLoadingContext, assetEntry.m_asset_type, assetEntry.m_asset_name))
             return nullptr;
     }
 
-    ObjLoading::FinalizeAssetsForZone(*assetLoadingContext);
+    objLoader->FinalizeAssetsForZone(*assetLoadingContext);
 
     return zone;
 }

src/Linker/Linker.cpp

@@ -139,7 +139,7 @@ class LinkerImpl final : public Linker
     {
         std::unique_ptr<ZoneDefinition> zoneDefinition;
         {
-            const auto definitionFileName = targetName + ".zone";
+            const auto definitionFileName = std::format("{}.zone", targetName);
             const auto definitionStream = sourceSearchPath->Open(definitionFileName);
             if (!definitionStream.IsOpen())
             {

src/Linker/ZoneCreation/ZoneCreator.cpp

@@ -1,5 +1,6 @@
 #include "ZoneCreator.h"
 
+#include "AssetLoading/AssetLoadingContext.h"
 #include "Game/IW3/ZoneCreatorIW3.h"
 #include "Game/IW4/ZoneCreatorIW4.h"
 #include "Game/IW5/ZoneCreatorIW5.h"

src/ObjLoading/Game/IW3/ObjLoaderIW3.cpp

@@ -48,11 +48,6 @@ ObjLoader::ObjLoader()
 #undef REGISTER_ASSET_LOADER
 }
 
-bool ObjLoader::SupportsZone(const Zone& zone) const
-{
-    return zone.m_game == &g_GameIW3;
-}
-
 bool ObjLoader::IsMpZone(const Zone& zone)
 {
     return zone.m_name.compare(0, 3, "mp_") == 0 || zone.m_name.compare(zone.m_name.length() - 3, 3, "_mp") == 0;

src/ObjLoading/Game/IW3/ObjLoaderIW3.h

@@ -19,8 +19,6 @@ namespace IW3
     public:
         ObjLoader();
 
-        [[nodiscard]] bool SupportsZone(const Zone& zone) const override;
-
         void LoadReferencedContainersForZone(ISearchPath& searchPath, Zone& zone) const override;
         void UnloadContainersOfZone(Zone& zone) const override;
 

src/ObjLoading/Game/IW4/ObjLoaderIW4.cpp

@@ -92,11 +92,6 @@ ObjLoader::ObjLoader()
 #undef REGISTER_ASSET_LOADER
 }
 
-bool ObjLoader::SupportsZone(const Zone& zone) const
-{
-    return zone.m_game == &g_GameIW4;
-}
-
 bool ObjLoader::IsMpZone(const Zone& zone)
 {
     return zone.m_name.compare(0, 3, "mp_") == 0 || zone.m_name.compare(zone.m_name.length() - 3, 3, "_mp") == 0;

src/ObjLoading/Game/IW4/ObjLoaderIW4.h

@@ -14,8 +14,6 @@ namespace IW4
     public:
         ObjLoader();
 
-        [[nodiscard]] bool SupportsZone(const Zone& zone) const override;
-
         void LoadReferencedContainersForZone(ISearchPath& searchPath, Zone& zone) const override;
         void UnloadContainersOfZone(Zone& zone) const override;
 

src/ObjLoading/Game/IW5/ObjLoaderIW5.cpp

@@ -99,11 +99,6 @@ ObjLoader::ObjLoader()
 #undef REGISTER_ASSET_LOADER
 }
 
-bool ObjLoader::SupportsZone(const Zone& zone) const
-{
-    return zone.m_game == &g_GameIW5;
-}
-
 bool ObjLoader::IsMpZone(const Zone& zone)
 {
     return zone.m_name.compare(0, 3, "mp_") == 0 || zone.m_name.compare(zone.m_name.length() - 3, 3, "_mp") == 0;

src/ObjLoading/Game/IW5/ObjLoaderIW5.h

@@ -14,8 +14,6 @@ namespace IW5
     public:
         ObjLoader();
 
-        [[nodiscard]] bool SupportsZone(const Zone& zone) const override;
-
         void LoadReferencedContainersForZone(ISearchPath& searchPath, Zone& zone) const override;
         void UnloadContainersOfZone(Zone& zone) const override;
 

src/ObjLoading/Game/T5/ObjLoaderT5.cpp

@@ -56,11 +56,6 @@ ObjLoader::ObjLoader()
 #undef REGISTER_ASSET_LOADER
 }
 
-bool ObjLoader::SupportsZone(const Zone& zone) const
-{
-    return zone.m_game == &g_GameT5;
-}
-
 bool ObjLoader::IsMpZone(const Zone& zone)
 {
     return zone.m_name.compare(0, 3, "mp_") == 0 || zone.m_name.compare(zone.m_name.length() - 3, 3, "_mp") == 0;

src/ObjLoading/Game/T5/ObjLoaderT5.h

@@ -14,8 +14,6 @@ namespace T5
     public:
         ObjLoader();
 
-        bool SupportsZone(const Zone& zone) const override;
-
         void LoadReferencedContainersForZone(ISearchPath& searchPath, Zone& zone) const override;
         void UnloadContainersOfZone(Zone& zone) const override;
 

src/ObjLoading/Game/T6/ObjLoaderT6.cpp

@@ -125,11 +125,6 @@ namespace T6
 #undef REGISTER_ASSET_LOADER
     }
 
-    bool ObjLoader::SupportsZone(const Zone& zone) const
-    {
-        return zone.m_game == &g_GameT6;
-    }
-
     bool ObjLoader::VerifySoundBankChecksum(const SoundBank& soundBank, const SndRuntimeAssetBank& sndRuntimeAssetBank)
     {
         SoundAssetBankChecksum checksum{};

src/ObjLoading/Game/T6/ObjLoaderT6.h

@@ -19,8 +19,6 @@ namespace T6
     public:
         ObjLoader();
 
-        [[nodiscard]] bool SupportsZone(const Zone& zone) const override;
-
         void LoadReferencedContainersForZone(ISearchPath& searchPath, Zone& zone) const override;
         void UnloadContainersOfZone(Zone& zone) const override;
 

src/ObjLoading/IObjLoader.cpp

@@ -0,0 +1,27 @@
+#include "IObjLoader.h"
+
+#include "Game/IW3/ObjLoaderIW3.h"
+#include "Game/IW4/ObjLoaderIW4.h"
+#include "Game/IW5/ObjLoaderIW5.h"
+#include "Game/T5/ObjLoaderT5.h"
+#include "Game/T6/ObjLoaderT6.h"
+
+#include <cassert>
+
+const IObjLoader* IObjLoader::GetObjLoaderForGame(GameId game)
+{
+    static const IObjLoader* zoneCreators[static_cast<unsigned>(GameId::COUNT)]{
+        new IW3::ObjLoader(),
+        new IW4::ObjLoader(),
+        new IW5::ObjLoader(),
+        new T5::ObjLoader(),
+        new T6::ObjLoader(),
+    };
+    static_assert(std::extent_v<decltype(zoneCreators)> == static_cast<unsigned>(GameId::COUNT));
+
+    assert(static_cast<unsigned>(game) < static_cast<unsigned>(GameId::COUNT));
+    const auto* result = zoneCreators[static_cast<unsigned>(game)];
+    assert(result);
+
+    return result;
+}

src/ObjLoading/IObjLoader.h

@@ -14,13 +14,6 @@ public:
     IObjLoader& operator=(const IObjLoader& other) = default;
     IObjLoader& operator=(IObjLoader&& other) noexcept = default;
 
-    /**
-     * \brief Checks whether this ObjLoader supports a specified zone.
-     * \param zone The zone to check.
-     * \return \c true if the specified zone is supported.
-     */
-    [[nodiscard]] virtual bool SupportsZone(const Zone& zone) const = 0;
-
     /**
      * \brief Loads all containers that are referenced by a specified zone.
      * \param searchPath The search path object to use to find the referenced containers.
@@ -36,4 +29,6 @@ public:
 
     virtual bool LoadAssetForZone(AssetLoadingContext& context, asset_type_t assetType, const std::string& assetName) const = 0;
     virtual void FinalizeAssetsForZone(AssetLoadingContext& context) const = 0;
+
+    static const IObjLoader* GetObjLoaderForGame(GameId game);
 };

src/ObjLoading/ObjLoading.cpp

@@ -1,10 +1,5 @@
 #include "ObjLoading.h"
 
-#include "Game/IW3/ObjLoaderIW3.h"
-#include "Game/IW4/ObjLoaderIW4.h"
-#include "Game/IW5/ObjLoaderIW5.h"
-#include "Game/T5/ObjLoaderT5.h"
-#include "Game/T6/ObjLoaderT6.h"
 #include "IObjLoader.h"
 #include "ObjContainer/IWD/IWD.h"
 #include "SearchPath/SearchPaths.h"
@@ -14,38 +9,6 @@
 
 ObjLoading::Configuration_t ObjLoading::Configuration;
 
-const IObjLoader* const OBJ_LOADERS[]{
-    new IW3::ObjLoader(),
-    new IW4::ObjLoader(),
-    new IW5::ObjLoader(),
-    new T5::ObjLoader(),
-    new T6::ObjLoader(),
-};
-
-void ObjLoading::LoadReferencedContainersForZone(ISearchPath& searchPath, Zone& zone)
-{
-    for (const auto* loader : OBJ_LOADERS)
-    {
-        if (loader->SupportsZone(zone))
-        {
-            loader->LoadReferencedContainersForZone(searchPath, zone);
-            return;
-        }
-    }
-}
-
-void ObjLoading::UnloadContainersOfZone(Zone& zone)
-{
-    for (const auto* loader : OBJ_LOADERS)
-    {
-        if (loader->SupportsZone(zone))
-        {
-            loader->UnloadContainersOfZone(zone);
-            return;
-        }
-    }
-}
-
 void ObjLoading::LoadIWDsInSearchPath(ISearchPath& searchPath)
 {
     searchPath.Find(SearchPathSearchOptions().IncludeSubdirectories(false).FilterExtensions("iwd"),
@@ -81,28 +44,3 @@ SearchPaths ObjLoading::GetIWDSearchPaths()
 
     return iwdPaths;
 }
-
-bool ObjLoading::LoadAssetForZone(AssetLoadingContext& context, const asset_type_t assetType, const std::string& assetName)
-{
-    for (const auto* loader : OBJ_LOADERS)
-    {
-        if (loader->SupportsZone(context.m_zone))
-        {
-            return loader->LoadAssetForZone(context, assetType, assetName);
-        }
-    }
-
-    return false;
-}
-
-void ObjLoading::FinalizeAssetsForZone(AssetLoadingContext& context)
-{
-    for (const auto* loader : OBJ_LOADERS)
-    {
-        if (loader->SupportsZone(context.m_zone))
-        {
-            loader->FinalizeAssetsForZone(context);
-            return;
-        }
-    }
-}

src/ObjLoading/ObjLoading.h

@@ -1,9 +1,7 @@
 #pragma once
 
-#include "AssetLoading/AssetLoadingContext.h"
 #include "SearchPath/ISearchPath.h"
 #include "SearchPath/SearchPaths.h"
-#include "Zone/Zone.h"
 
 class ObjLoading
 {
@@ -16,19 +14,6 @@ public:
         bool MenuNoOptimization = false;
     } Configuration;
 
-    /**
-     * \brief Loads all containers that are being referenced by the specified zone.
-     * \param searchPath The search path to use to find the referenced containers.
-     * \param zone The zone to load all referenced containers of.
-     */
-    static void LoadReferencedContainersForZone(ISearchPath& searchPath, Zone& zone);
-
-    /**
-     * \brief Unloads all containers that were referenced by a specified zone. If referenced by more than one zone a container will only be unloaded once all
-     * referencing zones were unloaded the container. \param zone The zone to unload all referenced containers for.
-     */
-    static void UnloadContainersOfZone(Zone& zone);
-
     /**
      * \brief Loads all IWDs that can be found in a specified search path.
      * \param searchPath The search path that contains IWDs to be loaded.
@@ -46,7 +31,4 @@ public:
      * \return A \c SearchPaths object containing all IWDs that are currently loaded.
      */
     static SearchPaths GetIWDSearchPaths();
-
-    static bool LoadAssetForZone(AssetLoadingContext& context, asset_type_t assetType, const std::string& assetName);
-    static void FinalizeAssetsForZone(AssetLoadingContext& context);
 };

src/ObjWriting/Dumping/IZoneDumper.h

@@ -1,17 +0,0 @@
-#pragma once
-
-#include "AssetDumpingContext.h"
-
-class IZoneDumper
-{
-public:
-    IZoneDumper() = default;
-    virtual ~IZoneDumper() = default;
-    IZoneDumper(const IZoneDumper& other) = default;
-    IZoneDumper(IZoneDumper&& other) noexcept = default;
-    IZoneDumper& operator=(const IZoneDumper& other) = default;
-    IZoneDumper& operator=(IZoneDumper&& other) noexcept = default;
-
-    virtual bool CanHandleZone(AssetDumpingContext& assetDumpingContext) const = 0;
-    virtual bool DumpZone(AssetDumpingContext& assetDumpingContext) const = 0;
-};

src/ObjWriting/Game/IW3/ObjWriterIW3.cpp

@@ -1,4 +1,4 @@
-#include "ZoneDumperIW3.h"
+#include "ObjWriterIW3.h"
 
 #include "AssetDumpers/AssetDumperGfxImage.h"
 #include "AssetDumpers/AssetDumperLoadedSound.h"
@@ -10,17 +10,11 @@
 #include "AssetDumpers/AssetDumperWeapon.h"
 #include "AssetDumpers/AssetDumperXModel.h"
 #include "Game/IW3/GameAssetPoolIW3.h"
-#include "Game/IW3/GameIW3.h"
 #include "ObjWriting.h"
 
 using namespace IW3;
 
-bool ZoneDumper::CanHandleZone(AssetDumpingContext& context) const
+bool ObjWriter::DumpZone(AssetDumpingContext& context) const
-{
-    return context.m_zone->m_game == &g_GameIW3;
-}
-
-bool ZoneDumper::DumpZone(AssetDumpingContext& context) const
 {
 #define DUMP_ASSET_POOL(dumperType, poolName, assetType)                                                                                                       \
     if (assetPools->poolName && ObjWriting::ShouldHandleAssetType(assetType))                                                                                  \

src/ObjWriting/Game/IW3/ObjWriterIW3.h

@@ -0,0 +1,11 @@
+#pragma once
+#include "IObjWriter.h"
+
+namespace IW3
+{
+    class ObjWriter final : public IObjWriter
+    {
+    public:
+        bool DumpZone(AssetDumpingContext& context) const override;
+    };
+} // namespace IW3

src/ObjWriting/Game/IW3/ZoneDumperIW3.h

@@ -1,12 +0,0 @@
-#pragma once
-#include "Dumping/IZoneDumper.h"
-
-namespace IW3
-{
-    class ZoneDumper final : public IZoneDumper
-    {
-    public:
-        bool CanHandleZone(AssetDumpingContext& context) const override;
-        bool DumpZone(AssetDumpingContext& context) const override;
-    };
-} // namespace IW3

src/ObjWriting/Game/IW4/ObjWriterIW4.cpp

@@ -1,4 +1,4 @@
-#include "ZoneDumperIW4.h"
+#include "ObjWriterIW4.h"
 
 #include "AssetDumpers/AssetDumperAddonMapEnts.h"
 #include "AssetDumpers/AssetDumperGfxImage.h"
@@ -23,17 +23,11 @@
 #include "AssetDumpers/AssetDumperWeapon.h"
 #include "AssetDumpers/AssetDumperXModel.h"
 #include "Game/IW4/GameAssetPoolIW4.h"
-#include "Game/IW4/GameIW4.h"
 #include "ObjWriting.h"
 
 using namespace IW4;
 
-bool ZoneDumper::CanHandleZone(AssetDumpingContext& context) const
+bool ObjWriter::DumpZone(AssetDumpingContext& context) const
-{
-    return context.m_zone->m_game == &g_GameIW4;
-}
-
-bool ZoneDumper::DumpZone(AssetDumpingContext& context) const
 {
 #define DUMP_ASSET_POOL(dumperType, poolName, assetType)                                                                                                       \
     if (assetPools->poolName && ObjWriting::ShouldHandleAssetType(assetType))                                                                                  \

src/ObjWriting/Game/IW4/ObjWriterIW4.h

@@ -0,0 +1,11 @@
+#pragma once
+#include "IObjWriter.h"
+
+namespace IW4
+{
+    class ObjWriter final : public IObjWriter
+    {
+    public:
+        bool DumpZone(AssetDumpingContext& context) const override;
+    };
+} // namespace IW4

src/ObjWriting/Game/IW4/ZoneDumperIW4.h

@@ -1,12 +0,0 @@
-#pragma once
-#include "Dumping/IZoneDumper.h"
-
-namespace IW4
-{
-    class ZoneDumper final : public IZoneDumper
-    {
-    public:
-        bool CanHandleZone(AssetDumpingContext& context) const override;
-        bool DumpZone(AssetDumpingContext& context) const override;
-    };
-} // namespace IW4

src/ObjWriting/Game/IW5/ObjWriterIW5.cpp

@@ -1,4 +1,4 @@
-#include "ZoneDumperIW5.h"
+#include "ObjWriterIW5.h"
 
 #include "AssetDumpers/AssetDumperAddonMapEnts.h"
 #include "AssetDumpers/AssetDumperGfxImage.h"
@@ -15,17 +15,11 @@
 #include "AssetDumpers/AssetDumperWeaponAttachment.h"
 #include "AssetDumpers/AssetDumperXModel.h"
 #include "Game/IW5/GameAssetPoolIW5.h"
-#include "Game/IW5/GameIW5.h"
 #include "ObjWriting.h"
 
 using namespace IW5;
 
-bool ZoneDumper::CanHandleZone(AssetDumpingContext& context) const
+bool ObjWriter::DumpZone(AssetDumpingContext& context) const
-{
-    return context.m_zone->m_game == &g_GameIW5;
-}
-
-bool ZoneDumper::DumpZone(AssetDumpingContext& context) const
 {
 #define DUMP_ASSET_POOL(dumperType, poolName, assetType)                                                                                                       \
     if (assetPools->poolName && ObjWriting::ShouldHandleAssetType(assetType))                                                                                  \

src/ObjWriting/Game/IW5/ObjWriterIW5.h

@@ -0,0 +1,11 @@
+#pragma once
+#include "IObjWriter.h"
+
+namespace IW5
+{
+    class ObjWriter final : public IObjWriter
+    {
+    public:
+        bool DumpZone(AssetDumpingContext& context) const override;
+    };
+} // namespace IW5

src/ObjWriting/Game/IW5/ZoneDumperIW5.h

@@ -1,12 +0,0 @@
-#pragma once
-#include "Dumping/IZoneDumper.h"
-
-namespace IW5
-{
-    class ZoneDumper final : public IZoneDumper
-    {
-    public:
-        bool CanHandleZone(AssetDumpingContext& context) const override;
-        bool DumpZone(AssetDumpingContext& context) const override;
-    };
-} // namespace IW5

src/ObjWriting/Game/T5/ObjWriterT5.cpp

@@ -1,4 +1,4 @@
-#include "ZoneDumperT5.h"
+#include "ObjWriterT5.h"
 
 #include "AssetDumpers/AssetDumperGfxImage.h"
 #include "AssetDumpers/AssetDumperLocalizeEntry.h"
@@ -10,17 +10,11 @@
 #include "AssetDumpers/AssetDumperWeapon.h"
 #include "AssetDumpers/AssetDumperXModel.h"
 #include "Game/T5/GameAssetPoolT5.h"
-#include "Game/T5/GameT5.h"
 #include "ObjWriting.h"
 
 using namespace T5;
 
-bool ZoneDumper::CanHandleZone(AssetDumpingContext& context) const
+bool ObjWriter::DumpZone(AssetDumpingContext& context) const
-{
-    return context.m_zone->m_game == &g_GameT5;
-}
-
-bool ZoneDumper::DumpZone(AssetDumpingContext& context) const
 {
 #define DUMP_ASSET_POOL(dumperType, poolName, assetType)                                                                                                       \
     if (assetPools->poolName && ObjWriting::ShouldHandleAssetType(assetType))                                                                                  \

src/ObjWriting/Game/T5/ObjWriterT5.h

@@ -0,0 +1,11 @@
+#pragma once
+#include "IObjWriter.h"
+
+namespace T5
+{
+    class ObjWriter final : public IObjWriter
+    {
+    public:
+        bool DumpZone(AssetDumpingContext& context) const override;
+    };
+} // namespace T5

src/ObjWriting/Game/T5/ZoneDumperT5.h

@@ -1,12 +0,0 @@
-#pragma once
-#include "Dumping/IZoneDumper.h"
-
-namespace T5
-{
-    class ZoneDumper final : public IZoneDumper
-    {
-    public:
-        bool CanHandleZone(AssetDumpingContext& context) const override;
-        bool DumpZone(AssetDumpingContext& context) const override;
-    };
-} // namespace T5

src/ObjWriting/Game/T6/ObjWriterT6.cpp

@@ -1,4 +1,4 @@
-#include "ZoneDumperT6.h"
+#include "ObjWriterT6.h"
 
 #include "AssetDumpers/AssetDumperFontIcon.h"
 #include "AssetDumpers/AssetDumperGfxImage.h"
@@ -24,17 +24,11 @@
 #include "AssetDumpers/AssetDumperXModel.h"
 #include "AssetDumpers/AssetDumperZBarrier.h"
 #include "Game/T6/GameAssetPoolT6.h"
-#include "Game/T6/GameT6.h"
 #include "ObjWriting.h"
 
 using namespace T6;
 
-bool ZoneDumper::CanHandleZone(AssetDumpingContext& context) const
+bool ObjWriter::DumpZone(AssetDumpingContext& context) const
-{
-    return context.m_zone->m_game == &g_GameT6;
-}
-
-bool ZoneDumper::DumpZone(AssetDumpingContext& context) const
 {
 #define DUMP_ASSET_POOL(dumperType, poolName, assetType)                                                                                                       \
     if (assetPools->poolName && ObjWriting::ShouldHandleAssetType(assetType))                                                                                  \

src/ObjWriting/Game/T6/ObjWriterT6.h

@@ -0,0 +1,11 @@
+#pragma once
+#include "IObjWriter.h"
+
+namespace T6
+{
+    class ObjWriter final : public IObjWriter
+    {
+    public:
+        bool DumpZone(AssetDumpingContext& context) const override;
+    };
+} // namespace T6

src/ObjWriting/Game/T6/ZoneDumperT6.h

@@ -1,12 +0,0 @@
-#pragma once
-#include "Dumping/IZoneDumper.h"
-
-namespace T6
-{
-    class ZoneDumper final : public IZoneDumper
-    {
-    public:
-        bool CanHandleZone(AssetDumpingContext& context) const override;
-        bool DumpZone(AssetDumpingContext& context) const override;
-    };
-} // namespace T6

src/ObjWriting/IObjWriter.cpp

@@ -0,0 +1,27 @@
+#include "IObjWriter.h"
+
+#include "Game/IW3/ObjWriterIW3.h"
+#include "Game/IW4/ObjWriterIW4.h"
+#include "Game/IW5/ObjWriterIW5.h"
+#include "Game/T5/ObjWriterT5.h"
+#include "Game/T6/ObjWriterT6.h"
+
+#include <cassert>
+
+const IObjWriter* IObjWriter::GetObjWriterForGame(GameId game)
+{
+    static const IObjWriter* zoneCreators[static_cast<unsigned>(GameId::COUNT)]{
+        new IW3::ObjWriter(),
+        new IW4::ObjWriter(),
+        new IW5::ObjWriter(),
+        new T5::ObjWriter(),
+        new T6::ObjWriter(),
+    };
+    static_assert(std::extent_v<decltype(zoneCreators)> == static_cast<unsigned>(GameId::COUNT));
+
+    assert(static_cast<unsigned>(game) < static_cast<unsigned>(GameId::COUNT));
+    const auto* result = zoneCreators[static_cast<unsigned>(game)];
+    assert(result);
+
+    return result;
+}

src/ObjWriting/IObjWriter.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#include "Dumping/AssetDumpingContext.h"
+
+class IObjWriter
+{
+public:
+    IObjWriter() = default;
+    virtual ~IObjWriter() = default;
+    IObjWriter(const IObjWriter& other) = default;
+    IObjWriter(IObjWriter&& other) noexcept = default;
+    IObjWriter& operator=(const IObjWriter& other) = default;
+    IObjWriter& operator=(IObjWriter&& other) noexcept = default;
+
+    virtual bool DumpZone(AssetDumpingContext& assetDumpingContext) const = 0;
+
+    static const IObjWriter* GetObjWriterForGame(GameId game);
+};

src/ObjWriting/ObjWriting.cpp

@@ -1,41 +1,7 @@
 #include "ObjWriting.h"
 
-#include "Dumping/IZoneDumper.h"
-#include "Game/IW3/ZoneDumperIW3.h"
-#include "Game/IW4/ZoneDumperIW4.h"
-#include "Game/IW5/ZoneDumperIW5.h"
-#include "Game/T5/ZoneDumperT5.h"
-#include "Game/T6/ZoneDumperT6.h"
-
 ObjWriting::Configuration_t ObjWriting::Configuration;
 
-const IZoneDumper* const ZONE_DUMPER[]{
-    new IW3::ZoneDumper(),
-    new IW4::ZoneDumper(),
-    new IW5::ZoneDumper(),
-    new T5::ZoneDumper(),
-    new T6::ZoneDumper(),
-};
-
-bool ObjWriting::DumpZone(AssetDumpingContext& context)
-{
-    for (const auto* dumper : ZONE_DUMPER)
-    {
-        if (dumper->CanHandleZone(context))
-        {
-            if (dumper->DumpZone(context))
-            {
-                return true;
-            }
-
-            printf("Dumper for zone '%s' failed!\n", context.m_zone->m_name.c_str());
-            return false;
-        }
-    }
-
-    return false;
-}
-
 bool ObjWriting::ShouldHandleAssetType(const asset_type_t assetType)
 {
     if (assetType < 0)

src/ObjWriting/ObjWriting.h

@@ -34,6 +34,5 @@ public:
 
     } Configuration;
 
-    static bool DumpZone(AssetDumpingContext& context);
     static bool ShouldHandleAssetType(asset_type_t assetType);
 };

src/Unlinker/ContentLister/ContentPrinter.cpp

@@ -3,15 +3,15 @@
 #include <format>
 #include <iostream>
 
-ContentPrinter::ContentPrinter(Zone* zone)
+ContentPrinter::ContentPrinter(const Zone& zone)
+    : m_zone(zone)
 {
-    m_zone = zone;
 }
 
 void ContentPrinter::PrintContent() const
 {
-    const auto* pools = m_zone->m_pools.get();
+    const auto* pools = m_zone.m_pools.get();
-    std::cout << std::format("Zone '{}' ({})\n", m_zone->m_name, m_zone->m_game->GetShortName());
+    std::cout << std::format("Zone '{}' ({})\n", m_zone.m_name, m_zone.m_game->GetShortName());
     std::cout << "Content:\n";
 
     for (const auto& asset : *pools)

src/Unlinker/ContentLister/ContentPrinter.h

@@ -4,10 +4,11 @@
 
 class ContentPrinter
 {
-    Zone* m_zone;
-
 public:
-    explicit ContentPrinter(Zone* zone);
+    explicit ContentPrinter(const Zone& zone);
 
     void PrintContent() const;
+
+private:
+    const Zone& m_zone;
 };

src/Unlinker/ContentLister/ZoneDefWriter.cpp

@@ -1,17 +1,42 @@
 #include "ZoneDefWriter.h"
 
-void AbstractZoneDefWriter::WriteZoneDef(std::ostream& stream, const UnlinkerArgs* args, Zone* zone) const
+#include "Game/IW3/ZoneDefWriterIW3.h"
+#include "Game/IW4/ZoneDefWriterIW4.h"
+#include "Game/IW5/ZoneDefWriterIW5.h"
+#include "Game/T5/ZoneDefWriterT5.h"
+#include "Game/T6/ZoneDefWriterT6.h"
+
+#include <cassert>
+
+const IZoneDefWriter* IZoneDefWriter::GetZoneDefWriterForGame(GameId game)
+{
+    static const IZoneDefWriter* zoneDefWriters[static_cast<unsigned>(GameId::COUNT)]{
+        new IW3::ZoneDefWriter(),
+        new IW4::ZoneDefWriter(),
+        new IW5::ZoneDefWriter(),
+        new T5::ZoneDefWriter(),
+        new T6::ZoneDefWriter(),
+    };
+
+    assert(static_cast<unsigned>(game) < static_cast<unsigned>(GameId::COUNT));
+    const auto* result = zoneDefWriters[static_cast<unsigned>(game)];
+    assert(result);
+
+    return result;
+}
+
+void AbstractZoneDefWriter::WriteZoneDef(std::ostream& stream, const UnlinkerArgs& args, const Zone& zone) const
 {
     ZoneDefinitionOutputStream out(stream);
 
-    out.WriteComment(zone->m_game->GetFullName());
+    out.WriteComment(zone.m_game->GetFullName());
-    out.WriteMetaData(META_DATA_KEY_GAME, zone->m_game->GetShortName());
+    out.WriteMetaData(META_DATA_KEY_GAME, zone.m_game->GetShortName());
     out.EmptyLine();
 
-    if (args->m_use_gdt)
+    if (args.m_use_gdt)
     {
         out.WriteComment("Load asset gdt files");
-        out.WriteMetaData(META_DATA_KEY_GDT, zone->m_name);
+        out.WriteMetaData(META_DATA_KEY_GDT, zone.m_name);
         out.EmptyLine();
     }
 

src/Unlinker/ContentLister/ZoneDefWriter.h

@@ -2,7 +2,6 @@
 
 #include "UnlinkerArgs.h"
 #include "Zone/Definition/ZoneDefinitionStream.h"
-#include "Zone/Zone.h"
 
 class IZoneDefWriter
 {
@@ -14,19 +13,20 @@ public:
     IZoneDefWriter& operator=(const IZoneDefWriter& other) = default;
     IZoneDefWriter& operator=(IZoneDefWriter&& other) noexcept = default;
 
-    virtual bool CanHandleZone(Zone* zone) const = 0;
+    virtual void WriteZoneDef(std::ostream& stream, const UnlinkerArgs& args, const Zone& zone) const = 0;
-    virtual void WriteZoneDef(std::ostream& stream, const UnlinkerArgs* args, Zone* zone) const = 0;
+
+    static const IZoneDefWriter* GetZoneDefWriterForGame(GameId game);
 };
 
 class AbstractZoneDefWriter : public IZoneDefWriter
 {
 protected:
-    static constexpr const char* META_DATA_KEY_GAME = "game";
+    static constexpr auto META_DATA_KEY_GAME = "game";
-    static constexpr const char* META_DATA_KEY_GDT = "gdt";
+    static constexpr auto META_DATA_KEY_GDT = "gdt";
 
-    virtual void WriteMetaData(ZoneDefinitionOutputStream& stream, const UnlinkerArgs* args, Zone* zone) const = 0;
+    virtual void WriteMetaData(ZoneDefinitionOutputStream& stream, const UnlinkerArgs& args, const Zone& zone) const = 0;
-    virtual void WriteContent(ZoneDefinitionOutputStream& stream, const UnlinkerArgs* args, Zone* zone) const = 0;
+    virtual void WriteContent(ZoneDefinitionOutputStream& stream, const UnlinkerArgs& args, const Zone& zone) const = 0;
 
 public:
-    void WriteZoneDef(std::ostream& stream, const UnlinkerArgs* args, Zone* zone) const override;
+    void WriteZoneDef(std::ostream& stream, const UnlinkerArgs& args, const Zone& zone) const override;
 };

src/Unlinker/Game/IW3/ZoneDefWriterIW3.cpp

@@ -1,22 +1,16 @@
 #include "ZoneDefWriterIW3.h"
 
 #include "Game/IW3/GameAssetPoolIW3.h"
-#include "Game/IW3/GameIW3.h"
 
 #include <cassert>
 
 using namespace IW3;
 
-bool ZoneDefWriter::CanHandleZone(Zone* zone) const
+void ZoneDefWriter::WriteMetaData(ZoneDefinitionOutputStream& stream, const UnlinkerArgs& args, const Zone& zone) const {}
-{
-    return zone->m_game == &g_GameIW3;
-}
 
-void ZoneDefWriter::WriteMetaData(ZoneDefinitionOutputStream& stream, const UnlinkerArgs* args, Zone* zone) const {}
+void ZoneDefWriter::WriteContent(ZoneDefinitionOutputStream& stream, const UnlinkerArgs& args, const Zone& zone) const
-
-void ZoneDefWriter::WriteContent(ZoneDefinitionOutputStream& stream, const UnlinkerArgs* args, Zone* zone) const
 {
-    const auto* pools = dynamic_cast<GameAssetPoolIW3*>(zone->m_pools.get());
+    const auto* pools = dynamic_cast<GameAssetPoolIW3*>(zone.m_pools.get());
 
     assert(pools);
     if (!pools)
@@ -24,9 +18,7 @@ void ZoneDefWriter::WriteContent(ZoneDefinitionOutputStream& stream, const Unlin
 
     // Localized strings are all collected in one string file. So only add this to the zone file.
     if (!pools->m_localize->m_asset_lookup.empty())
-    {
+        stream.WriteEntry(*pools->GetAssetTypeName(ASSET_TYPE_LOCALIZE_ENTRY), zone.m_name);
-        stream.WriteEntry(*pools->GetAssetTypeName(ASSET_TYPE_LOCALIZE_ENTRY), zone->m_name);
-    }
 
     for (const auto& asset : *pools)
     {

src/Unlinker/Game/IW3/ZoneDefWriterIW3.h

@@ -7,10 +7,7 @@ namespace IW3
     class ZoneDefWriter final : public AbstractZoneDefWriter
     {
     protected:
-        void WriteMetaData(ZoneDefinitionOutputStream& stream, const UnlinkerArgs* args, Zone* zone) const override;
+        void WriteMetaData(ZoneDefinitionOutputStream& stream, const UnlinkerArgs& args, const Zone& zone) const override;
-        void WriteContent(ZoneDefinitionOutputStream& stream, const UnlinkerArgs* args, Zone* zone) const override;
+        void WriteContent(ZoneDefinitionOutputStream& stream, const UnlinkerArgs& args, const Zone& zone) const override;
-
-    public:
-        bool CanHandleZone(Zone* zone) const override;
     };
 } // namespace IW3

src/Unlinker/Game/IW4/ZoneDefWriterIW4.cpp

@@ -1,22 +1,16 @@
 #include "ZoneDefWriterIW4.h"
 
 #include "Game/IW4/GameAssetPoolIW4.h"
-#include "Game/IW4/GameIW4.h"
 
 #include <cassert>
 
 using namespace IW4;
 
-bool ZoneDefWriter::CanHandleZone(Zone* zone) const
+void ZoneDefWriter::WriteMetaData(ZoneDefinitionOutputStream& stream, const UnlinkerArgs& args, const Zone& zone) const {}
-{
-    return zone->m_game == &g_GameIW4;
-}
 
-void ZoneDefWriter::WriteMetaData(ZoneDefinitionOutputStream& stream, const UnlinkerArgs* args, Zone* zone) const {}
+void ZoneDefWriter::WriteContent(ZoneDefinitionOutputStream& stream, const UnlinkerArgs& args, const Zone& zone) const
-
-void ZoneDefWriter::WriteContent(ZoneDefinitionOutputStream& stream, const UnlinkerArgs* args, Zone* zone) const
 {
-    const auto* pools = dynamic_cast<GameAssetPoolIW4*>(zone->m_pools.get());
+    const auto* pools = dynamic_cast<GameAssetPoolIW4*>(zone.m_pools.get());
 
     assert(pools);
     if (!pools)
@@ -24,9 +18,7 @@ void ZoneDefWriter::WriteContent(ZoneDefinitionOutputStream& stream, const Unlin
 
     // Localized strings are all collected in one string file. So only add this to the zone file.
     if (!pools->m_localize->m_asset_lookup.empty())
-    {
+        stream.WriteEntry(*pools->GetAssetTypeName(ASSET_TYPE_LOCALIZE_ENTRY), zone.m_name);
-        stream.WriteEntry(*pools->GetAssetTypeName(ASSET_TYPE_LOCALIZE_ENTRY), zone->m_name);
-    }
 
     for (const auto& asset : *pools)
     {

src/Unlinker/Game/IW4/ZoneDefWriterIW4.h

@@ -7,10 +7,7 @@ namespace IW4
     class ZoneDefWriter final : public AbstractZoneDefWriter
     {
     protected:
-        void WriteMetaData(ZoneDefinitionOutputStream& stream, const UnlinkerArgs* args, Zone* zone) const override;
+        void WriteMetaData(ZoneDefinitionOutputStream& stream, const UnlinkerArgs& args, const Zone& zone) const override;
-        void WriteContent(ZoneDefinitionOutputStream& stream, const UnlinkerArgs* args, Zone* zone) const override;
+        void WriteContent(ZoneDefinitionOutputStream& stream, const UnlinkerArgs& args, const Zone& zone) const override;
-
-    public:
-        bool CanHandleZone(Zone* zone) const override;
     };
 } // namespace IW4

src/Unlinker/Game/IW5/ZoneDefWriterIW5.cpp

@@ -1,22 +1,16 @@
 #include "ZoneDefWriterIW5.h"
 
 #include "Game/IW5/GameAssetPoolIW5.h"
-#include "Game/IW5/GameIW5.h"
 
 #include <cassert>
 
 using namespace IW5;
 
-bool ZoneDefWriter::CanHandleZone(Zone* zone) const
+void ZoneDefWriter::WriteMetaData(ZoneDefinitionOutputStream& stream, const UnlinkerArgs& args, const Zone& zone) const {}
-{
-    return zone->m_game == &g_GameIW5;
-}
 
-void ZoneDefWriter::WriteMetaData(ZoneDefinitionOutputStream& stream, const UnlinkerArgs* args, Zone* zone) const {}
+void ZoneDefWriter::WriteContent(ZoneDefinitionOutputStream& stream, const UnlinkerArgs& args, const Zone& zone) const
-
-void ZoneDefWriter::WriteContent(ZoneDefinitionOutputStream& stream, const UnlinkerArgs* args, Zone* zone) const
 {
-    const auto* pools = dynamic_cast<GameAssetPoolIW5*>(zone->m_pools.get());
+    const auto* pools = dynamic_cast<GameAssetPoolIW5*>(zone.m_pools.get());
 
     assert(pools);
     if (!pools)
@@ -24,9 +18,7 @@ void ZoneDefWriter::WriteContent(ZoneDefinitionOutputStream& stream, const Unlin
 
     // Localized strings are all collected in one string file. So only add this to the zone file.
     if (!pools->m_localize->m_asset_lookup.empty())
-    {
+        stream.WriteEntry(*pools->GetAssetTypeName(ASSET_TYPE_LOCALIZE_ENTRY), zone.m_name);
-        stream.WriteEntry(*pools->GetAssetTypeName(ASSET_TYPE_LOCALIZE_ENTRY), zone->m_name);
-    }
 
     for (const auto& asset : *pools)
     {

src/Unlinker/Game/IW5/ZoneDefWriterIW5.h

@@ -7,10 +7,7 @@ namespace IW5
     class ZoneDefWriter final : public AbstractZoneDefWriter
     {
     protected:
-        void WriteMetaData(ZoneDefinitionOutputStream& stream, const UnlinkerArgs* args, Zone* zone) const override;
+        void WriteMetaData(ZoneDefinitionOutputStream& stream, const UnlinkerArgs& args, const Zone& zone) const override;
-        void WriteContent(ZoneDefinitionOutputStream& stream, const UnlinkerArgs* args, Zone* zone) const override;
+        void WriteContent(ZoneDefinitionOutputStream& stream, const UnlinkerArgs& args, const Zone& zone) const override;
-
-    public:
-        bool CanHandleZone(Zone* zone) const override;
     };
 } // namespace IW5

src/Unlinker/Game/T5/ZoneDefWriterT5.cpp

@@ -1,22 +1,16 @@
 #include "ZoneDefWriterT5.h"
 
 #include "Game/T5/GameAssetPoolT5.h"
-#include "Game/T5/GameT5.h"
 
 #include <cassert>
 
 using namespace T5;
 
-bool ZoneDefWriter::CanHandleZone(Zone* zone) const
+void ZoneDefWriter::WriteMetaData(ZoneDefinitionOutputStream& stream, const UnlinkerArgs& args, const Zone& zone) const {}
-{
-    return zone->m_game == &g_GameT5;
-}
 
-void ZoneDefWriter::WriteMetaData(ZoneDefinitionOutputStream& stream, const UnlinkerArgs* args, Zone* zone) const {}
+void ZoneDefWriter::WriteContent(ZoneDefinitionOutputStream& stream, const UnlinkerArgs& args, const Zone& zone) const
-
-void ZoneDefWriter::WriteContent(ZoneDefinitionOutputStream& stream, const UnlinkerArgs* args, Zone* zone) const
 {
-    const auto* pools = dynamic_cast<GameAssetPoolT5*>(zone->m_pools.get());
+    const auto* pools = dynamic_cast<GameAssetPoolT5*>(zone.m_pools.get());
 
     assert(pools);
     if (!pools)
@@ -24,9 +18,7 @@ void ZoneDefWriter::WriteContent(ZoneDefinitionOutputStream& stream, const Unlin
 
     // Localized strings are all collected in one string file. So only add this to the zone file.
     if (!pools->m_localize->m_asset_lookup.empty())
-    {
+        stream.WriteEntry(*pools->GetAssetTypeName(ASSET_TYPE_LOCALIZE_ENTRY), zone.m_name);
-        stream.WriteEntry(*pools->GetAssetTypeName(ASSET_TYPE_LOCALIZE_ENTRY), zone->m_name);
-    }
 
     for (const auto& asset : *pools)
     {

src/Unlinker/Game/T5/ZoneDefWriterT5.h

@@ -7,10 +7,7 @@ namespace T5
     class ZoneDefWriter final : public AbstractZoneDefWriter
     {
     protected:
-        void WriteMetaData(ZoneDefinitionOutputStream& stream, const UnlinkerArgs* args, Zone* zone) const override;
+        void WriteMetaData(ZoneDefinitionOutputStream& stream, const UnlinkerArgs& args, const Zone& zone) const override;
-        void WriteContent(ZoneDefinitionOutputStream& stream, const UnlinkerArgs* args, Zone* zone) const override;
+        void WriteContent(ZoneDefinitionOutputStream& stream, const UnlinkerArgs& args, const Zone& zone) const override;
-
-    public:
-        bool CanHandleZone(Zone* zone) const override;
     };
 } // namespace T5

src/Unlinker/Game/T6/ZoneDefWriterT6.cpp

@@ -2,7 +2,6 @@
 
 #include "Game/T6/CommonT6.h"
 #include "Game/T6/GameAssetPoolT6.h"
-#include "Game/T6/GameT6.h"
 
 #include <cassert>
 #include <iomanip>
@@ -10,7 +9,7 @@
 
 using namespace T6;
 
-namespace T6
+namespace
 {
     class KeyValuePairKnownKey
     {
@@ -31,50 +30,43 @@ namespace T6
         KeyValuePairKnownKey("initial_xmodels"),
         KeyValuePairKnownKey("initial_materials"),
     };
-} // namespace T6
 
-bool ZoneDefWriter::CanHandleZone(Zone* zone) const
+    void WriteKeyValuePair(ZoneDefinitionOutputStream& stream, const KeyValuePair& kvp)
-{
-    return zone->m_game == &g_GameT6;
-}
-
-void ZoneDefWriter::WriteKeyValuePair(ZoneDefinitionOutputStream& stream, KeyValuePair* kvp)
-{
-    for (const auto& knownKey : KEY_VALUE_PAIR_KNOWN_KEYS)
     {
-        if (knownKey.m_hash == kvp->keyHash)
+        for (const auto& knownKey : KEY_VALUE_PAIR_KNOWN_KEYS)
         {
-            stream.WriteMetaData("level." + knownKey.m_key, kvp->value);
+            if (knownKey.m_hash == kvp.keyHash)
-            return;
+            {
+                stream.WriteMetaData("level." + knownKey.m_key, kvp.value);
+                return;
+            }
         }
+
+        std::ostringstream str;
+        str << "level.@" << std::setfill('0') << std::setw(sizeof(int) * 2) << std::hex << kvp.keyHash;
+        stream.WriteMetaData(str.str(), kvp.value);
     }
+} // namespace
 
-    std::ostringstream str;
+void ZoneDefWriter::WriteMetaData(ZoneDefinitionOutputStream& stream, const UnlinkerArgs& args, const Zone& zone) const
-    str << "level.@" << std::setfill('0') << std::setw(sizeof(int) * 2) << std::hex << kvp->keyHash;
-    stream.WriteMetaData(str.str(), kvp->value);
-}
-
-void ZoneDefWriter::WriteMetaData(ZoneDefinitionOutputStream& stream, const UnlinkerArgs* args, Zone* zone) const
 {
-    auto* assetPoolT6 = dynamic_cast<GameAssetPoolT6*>(zone->m_pools.get());
+    const auto* assetPoolT6 = dynamic_cast<GameAssetPoolT6*>(zone.m_pools.get());
     if (assetPoolT6 && !assetPoolT6->m_key_value_pairs->m_asset_lookup.empty())
     {
         for (const auto* kvpAsset : *assetPoolT6->m_key_value_pairs)
         {
             const auto* keyValuePairs = kvpAsset->Asset();
             for (auto varIndex = 0; varIndex < keyValuePairs->numVariables; varIndex++)
-            {
+                WriteKeyValuePair(stream, keyValuePairs->keyValuePairs[varIndex]);
-                WriteKeyValuePair(stream, &keyValuePairs->keyValuePairs[varIndex]);
-            }
         }
 
         stream.EmptyLine();
     }
 }
 
-void ZoneDefWriter::WriteContent(ZoneDefinitionOutputStream& stream, const UnlinkerArgs* args, Zone* zone) const
+void ZoneDefWriter::WriteContent(ZoneDefinitionOutputStream& stream, const UnlinkerArgs& args, const Zone& zone) const
 {
-    const auto* pools = dynamic_cast<GameAssetPoolT6*>(zone->m_pools.get());
+    const auto* pools = dynamic_cast<GameAssetPoolT6*>(zone.m_pools.get());
 
     assert(pools);
     if (!pools)
@@ -82,9 +74,7 @@ void ZoneDefWriter::WriteContent(ZoneDefinitionOutputStream& stream, const Unlin
 
     // Localized strings are all collected in one string file. So only add this to the zone file.
     if (!pools->m_localize->m_asset_lookup.empty())
-    {
+        stream.WriteEntry(*pools->GetAssetTypeName(ASSET_TYPE_LOCALIZE_ENTRY), zone.m_name);
-        stream.WriteEntry(*pools->GetAssetTypeName(ASSET_TYPE_LOCALIZE_ENTRY), zone->m_name);
-    }
 
     for (const auto& asset : *pools)
     {

src/Unlinker/Game/T6/ZoneDefWriterT6.h

@@ -1,19 +1,13 @@
 #pragma once
 
 #include "ContentLister/ZoneDefWriter.h"
-#include "Game/T6/T6.h"
 
 namespace T6
 {
     class ZoneDefWriter final : public AbstractZoneDefWriter
     {
-        static void WriteKeyValuePair(ZoneDefinitionOutputStream& stream, KeyValuePair* kvp);
-
     protected:
-        void WriteMetaData(ZoneDefinitionOutputStream& stream, const UnlinkerArgs* args, Zone* zone) const override;
+        void WriteMetaData(ZoneDefinitionOutputStream& stream, const UnlinkerArgs& args, const Zone& zone) const override;
-        void WriteContent(ZoneDefinitionOutputStream& stream, const UnlinkerArgs* args, Zone* zone) const override;
+        void WriteContent(ZoneDefinitionOutputStream& stream, const UnlinkerArgs& args, const Zone& zone) const override;
-
-    public:
-        bool CanHandleZone(Zone* zone) const override;
     };
 } // namespace T6

src/Unlinker/Unlinker.cpp

@@ -2,11 +2,8 @@
 
 #include "ContentLister/ContentPrinter.h"
 #include "ContentLister/ZoneDefWriter.h"
-#include "Game/IW3/ZoneDefWriterIW3.h"
+#include "IObjLoader.h"
-#include "Game/IW4/ZoneDefWriterIW4.h"
+#include "IObjWriter.h"
-#include "Game/IW5/ZoneDefWriterIW5.h"
-#include "Game/T5/ZoneDefWriterT5.h"
-#include "Game/T6/ZoneDefWriterT6.h"
 #include "ObjContainer/IWD/IWD.h"
 #include "ObjLoading.h"
 #include "ObjWriting.h"
@@ -25,14 +22,6 @@
 
 namespace fs = std::filesystem;
 
-const IZoneDefWriter* const ZONE_DEF_WRITERS[]{
-    new IW3::ZoneDefWriter(),
-    new IW4::ZoneDefWriter(),
-    new IW5::ZoneDefWriter(),
-    new T5::ZoneDefWriter(),
-    new T6::ZoneDefWriter(),
-};
-
 class Unlinker::Impl
 {
 public:
@@ -166,51 +155,41 @@ private:
         return true;
     }
 
-    bool WriteZoneDefinitionFile(Zone* zone, const fs::path& zoneDefinitionFileFolder) const
+    bool WriteZoneDefinitionFile(const Zone& zone, const fs::path& zoneDefinitionFileFolder) const
     {
         auto zoneDefinitionFilePath(zoneDefinitionFileFolder);
-        zoneDefinitionFilePath.append(zone->m_name);
+        zoneDefinitionFilePath.append(zone.m_name);
         zoneDefinitionFilePath.replace_extension(".zone");
 
         std::ofstream zoneDefinitionFile(zoneDefinitionFilePath, std::fstream::out | std::fstream::binary);
         if (!zoneDefinitionFile.is_open())
         {
-            std::cerr << std::format("Failed to open file for zone definition file of zone \"{}\".\n", zone->m_name);
+            std::cerr << std::format("Failed to open file for zone definition file of zone \"{}\".\n", zone.m_name);
             return false;
         }
 
-        auto result = false;
+        const auto* zoneDefWriter = IZoneDefWriter::GetZoneDefWriterForGame(zone.m_game->GetId());
-        for (const auto* zoneDefWriter : ZONE_DEF_WRITERS)
+        zoneDefWriter->WriteZoneDef(zoneDefinitionFile, m_args, zone);
-        {
-            if (zoneDefWriter->CanHandleZone(zone))
-            {
-                zoneDefWriter->WriteZoneDef(zoneDefinitionFile, &m_args, zone);
-                result = true;
-                break;
-            }
-        }
-
-        if (!result)
-            std::cerr << std::format("Failed to find writer for zone definition file of zone \"{}\".\n", zone->m_name);
 
         zoneDefinitionFile.close();
-        return result;
+
+        return true;
     }
 
-    static bool OpenGdtFile(Zone* zone, const fs::path& outputFolder, std::ofstream& stream)
+    static bool OpenGdtFile(const Zone& zone, const fs::path& outputFolder, std::ofstream& stream)
     {
         auto gdtFilePath(outputFolder);
         gdtFilePath.append("source_data");
 
         fs::create_directories(gdtFilePath);
 
-        gdtFilePath.append(zone->m_name);
+        gdtFilePath.append(zone.m_name);
         gdtFilePath.replace_extension(".gdt");
 
         stream = std::ofstream(gdtFilePath, std::fstream::out | std::fstream::binary);
         if (!stream.is_open())
         {
-            std::cerr << std::format("Failed to open file for zone definition file of zone \"{}\".\n", zone->m_name);
+            std::cerr << std::format("Failed to open file for zone definition file of zone \"{}\".\n", zone.m_name);
             return false;
         }
 
@@ -274,7 +253,7 @@ private:
      * \param zone The zone to handle.
      * \return \c true if handling the zone was successful, otherwise \c false.
      */
-    bool HandleZone(ISearchPath& searchPath, Zone* zone) const
+    bool HandleZone(ISearchPath& searchPath, Zone& zone) const
     {
         if (m_args.m_task == UnlinkerArgs::ProcessingTask::LIST)
         {
@@ -295,7 +274,7 @@ private:
 
             std::ofstream gdtStream;
             AssetDumpingContext context;
-            context.m_zone = zone;
+            context.m_zone = &zone;
             context.m_base_path = outputFolderPath;
             context.m_obj_search_path = &searchPath;
 
@@ -305,18 +284,27 @@ private:
                     return false;
                 auto gdt = std::make_unique<GdtOutputStream>(gdtStream);
                 gdt->BeginStream();
-                gdt->WriteVersion(GdtVersion(zone->m_game->GetShortName(), 1));
+                gdt->WriteVersion(GdtVersion(zone.m_game->GetShortName(), 1));
                 context.m_gdt = std::move(gdt);
             }
 
             UpdateAssetIncludesAndExcludes(context);
-            ObjWriting::DumpZone(context);
+
+            const auto* objWriter = IObjWriter::GetObjWriterForGame(zone.m_game->GetId());
+
+            auto result = objWriter->DumpZone(context);
 
             if (m_args.m_use_gdt)
             {
                 context.m_gdt->EndStream();
                 gdtStream.close();
             }
+
+            if (!result)
+            {
+                std::cerr << "Dumping zone failed!\n";
+                return false;
+            }
         }
 
         return true;
@@ -348,7 +336,10 @@ private:
                 std::cout << std::format("Loaded zone \"{}\"\n", zone->m_name);
 
             if (ShouldLoadObj())
-                ObjLoading::LoadReferencedContainersForZone(searchPathsForZone, *zone);
+            {
+                const auto* objLoader = IObjLoader::GetObjLoaderForGame(zone->m_game->GetId());
+                objLoader->LoadReferencedContainersForZone(searchPathsForZone, *zone);
+            }
 
             m_loaded_zones.emplace_back(std::move(zone));
         }
@@ -366,7 +357,10 @@ private:
             const auto zoneName = loadedZone->m_name;
 
             if (ShouldLoadObj())
-                ObjLoading::UnloadContainersOfZone(*loadedZone);
+            {
+                const auto* objLoader = IObjLoader::GetObjLoaderForGame(loadedZone->m_game->GetId());
+                objLoader->UnloadContainersOfZone(*loadedZone);
+            }
 
             loadedZone.reset();
 
@@ -406,14 +400,15 @@ private:
             if (m_args.m_verbose)
                 std::cout << std::format("Loaded zone \"{}\"\n", zoneName);
 
+            const auto* objLoader = IObjLoader::GetObjLoaderForGame(zone->m_game->GetId());
             if (ShouldLoadObj())
-                ObjLoading::LoadReferencedContainersForZone(searchPathsForZone, *zone);
+                objLoader->LoadReferencedContainersForZone(searchPathsForZone, *zone);
 
-            if (!HandleZone(searchPathsForZone, zone.get()))
+            if (!HandleZone(searchPathsForZone, *zone))
                 return false;
 
             if (ShouldLoadObj())
-                ObjLoading::UnloadContainersOfZone(*zone);
+                objLoader->UnloadContainersOfZone(*zone);
 
             zone.reset();
             if (m_args.m_verbose)

src/Unlinker/UnlinkerArgs.cpp

@@ -377,7 +377,7 @@ bool UnlinkerArgs::ParseArgs(const int argc, const char** argv, bool& shouldCont
     return true;
 }
 
-std::string UnlinkerArgs::GetOutputFolderPathForZone(const Zone* zone) const
+std::string UnlinkerArgs::GetOutputFolderPathForZone(const Zone& zone) const
 {
-    return std::regex_replace(m_output_folder, m_zone_pattern, zone->m_name);
+    return std::regex_replace(m_output_folder, m_zone_pattern, zone.m_name);
 }

src/Unlinker/UnlinkerArgs.h

@@ -68,5 +68,5 @@ public:
      * \param zone The zone to resolve the path input for.
      * \return An output path for the zone based on the user input.
      */
-    std::string GetOutputFolderPathForZone(const Zone* zone) const;
+    std::string GetOutputFolderPathForZone(const Zone& zone) const;
 };