From b6a0fa3518ad920946c60bb205277e8104fd1cf0 Mon Sep 17 00:00:00 2001 From: Shauren Date: Wed, 12 Jul 2023 20:51:39 +0200 Subject: Tools: Updated db2 metadata used by extractors --- src/tools/map_extractor/System.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/tools/map_extractor') diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp index 6257e4c6ff2..ee57b149825 100644 --- a/src/tools/map_extractor/System.cpp +++ b/src/tools/map_extractor/System.cpp @@ -270,9 +270,9 @@ void ReadMapDBC() { printf("Read Map.db2 file...\n"); - DB2CascFileSource source(CascStorage, MapLoadInfo::Instance()->Meta->FileDataId); + DB2CascFileSource source(CascStorage, MapLoadInfo::Instance.Meta->FileDataId); DB2FileLoader db2; - TryLoadDB2("Map.db2", &source, &db2, MapLoadInfo::Instance()); + TryLoadDB2("Map.db2", &source, &db2, &MapLoadInfo::Instance); map_ids.reserve(db2.GetRecordCount()); std::unordered_map idToIndex; @@ -315,9 +315,9 @@ void ReadLiquidMaterialTable() { printf("Read LiquidMaterial.db2 file...\n"); - DB2CascFileSource source(CascStorage, LiquidMaterialLoadInfo::Instance()->Meta->FileDataId); + DB2CascFileSource source(CascStorage, LiquidMaterialLoadInfo::Instance.Meta->FileDataId); DB2FileLoader db2; - TryLoadDB2("LiquidMaterial.db2", &source, &db2, LiquidMaterialLoadInfo::Instance()); + TryLoadDB2("LiquidMaterial.db2", &source, &db2, &LiquidMaterialLoadInfo::Instance); for (uint32 x = 0; x < db2.GetRecordCount(); ++x) { @@ -339,9 +339,9 @@ void ReadLiquidObjectTable() { printf("Read LiquidObject.db2 file...\n"); - DB2CascFileSource source(CascStorage, LiquidObjectLoadInfo::Instance()->Meta->FileDataId); + DB2CascFileSource source(CascStorage, LiquidObjectLoadInfo::Instance.Meta->FileDataId); DB2FileLoader db2; - TryLoadDB2("LiquidObject.db2", &source, &db2, LiquidObjectLoadInfo::Instance()); + TryLoadDB2("LiquidObject.db2", &source, &db2, &LiquidObjectLoadInfo::Instance); for (uint32 x = 0; x < db2.GetRecordCount(); ++x) { @@ -363,9 +363,9 @@ void ReadLiquidTypeTable() { printf("Read LiquidType.db2 file...\n"); - DB2CascFileSource source(CascStorage, LiquidTypeLoadInfo::Instance()->Meta->FileDataId); + DB2CascFileSource source(CascStorage, LiquidTypeLoadInfo::Instance.Meta->FileDataId); DB2FileLoader db2; - TryLoadDB2("LiquidType.db2", &source, &db2, LiquidTypeLoadInfo::Instance()); + TryLoadDB2("LiquidType.db2", &source, &db2, &LiquidTypeLoadInfo::Instance); for (uint32 x = 0; x < db2.GetRecordCount(); ++x) { @@ -388,9 +388,9 @@ bool ReadCinematicCameraDBC() { printf("Read CinematicCamera.db2 file...\n"); - DB2CascFileSource source(CascStorage, CinematicCameraLoadInfo::Instance()->Meta->FileDataId); + DB2CascFileSource source(CascStorage, CinematicCameraLoadInfo::Instance.Meta->FileDataId); DB2FileLoader db2; - TryLoadDB2("CinematicCamera.db2", &source, &db2, CinematicCameraLoadInfo::Instance()); + TryLoadDB2("CinematicCamera.db2", &source, &db2, &CinematicCameraLoadInfo::Instance); // get camera file list from DB2 for (size_t i = 0; i < db2.GetRecordCount(); ++i) -- cgit v1.2.3