zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-09-24 01:06:40 +00:00
Code Activity

refactor: only refer to game id in zone

Browse Source
This commit is contained in:
Jan Laupetin
2025-08-30 16:49:09 +02:00
parent 495e85f945
commit 734173066b
56 changed files with 145 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Unlinker/ContentLister/ContentPrinter.cpp
View File

@@ -11,7 +11,8 @@ ContentPrinter::ContentPrinter(const Zone& zone)
void ContentPrinter::PrintContent() const
{
const auto* pools = m_zone.m_pools.get();
std::cout << std::format("Zone '{}' ({})\n", m_zone.m_name, m_zone.m_game->GetShortName());
const auto* game = IGame::GetGameById(m_zone.m_game_id);
std::cout << std::format("Zone '{}' ({})\n", m_zone.m_name, game->GetShortName());
std::cout << "Content:\n";
for (const auto& asset : *pools)

5
src/Unlinker/ContentLister/ZoneDefWriter.cpp
View File

@@ -28,9 +28,10 @@ const IZoneDefWriter* IZoneDefWriter::GetZoneDefWriterForGame(GameId game)
void AbstractZoneDefWriter::WriteZoneDef(std::ostream& stream, const UnlinkerArgs& args, const Zone& zone) const
{
ZoneDefinitionOutputStream out(stream);
const auto* game = IGame::GetGameById(zone.m_game_id);
out.WriteComment(zone.m_game->GetFullName());
out.WriteMetaData(META_DATA_KEY_GAME, zone.m_game->GetShortName());
out.WriteComment(game->GetFullName());
out.WriteMetaData(META_DATA_KEY_GAME, game->GetShortName());
out.EmptyLine();
if (args.m_use_gdt)

15
src/Unlinker/Unlinker.cpp
View File

@@ -71,7 +71,7 @@ private:
return false;
}
const auto* zoneDefWriter = IZoneDefWriter::GetZoneDefWriterForGame(zone.m_game->GetId());
const auto* zoneDefWriter = IZoneDefWriter::GetZoneDefWriterForGame(zone.m_game_id);
zoneDefWriter->WriteZoneDef(zoneDefinitionFile, m_args, zone);
zoneDefinitionFile.close();
@@ -186,13 +186,16 @@ private:
return false;
auto gdt = std::make_unique<GdtOutputStream>(gdtStream);
gdt->BeginStream();
gdt->WriteVersion(GdtVersion(zone.m_game->GetShortName(), 1));
const auto* game = IGame::GetGameById(zone.m_game_id);
gdt->WriteVersion(GdtVersion(game->GetShortName(), 1));
context.m_gdt = std::move(gdt);
}
UpdateAssetIncludesAndExcludes(context);
const auto* objWriter = IObjWriter::GetObjWriterForGame(zone.m_game->GetId());
const auto* objWriter = IObjWriter::GetObjWriterForGame(zone.m_game_id);
auto result = objWriter->DumpZone(context);
@@ -237,7 +240,7 @@ private:
if (ShouldLoadObj())
{
const auto* objLoader = IObjLoader::GetObjLoaderForGame(zone->m_game->GetId());
const auto* objLoader = IObjLoader::GetObjLoaderForGame(zone->m_game_id);
objLoader->LoadReferencedContainersForZone(*searchPathsForZone, *zone);
}
@@ -258,7 +261,7 @@ private:
if (ShouldLoadObj())
{
const auto* objLoader = IObjLoader::GetObjLoaderForGame(loadedZone->m_game->GetId());
const auto* objLoader = IObjLoader::GetObjLoaderForGame(loadedZone->m_game_id);
objLoader->UnloadContainersOfZone(*loadedZone);
}
@@ -299,7 +302,7 @@ private:
if (m_args.m_verbose)
std::cout << std::format("Loaded zone \"{}\"\n", zoneName);
const auto* objLoader = IObjLoader::GetObjLoaderForGame(zone->m_game->GetId());
const auto* objLoader = IObjLoader::GetObjLoaderForGame(zone->m_game_id);
if (ShouldLoadObj())
objLoader->LoadReferencedContainersForZone(*searchPathsForZone, *zone);