aboutsummaryrefslogtreecommitdiff
path: root/src/tools/map_extractor
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2023-07-12 20:51:39 +0200
committerShauren <shauren.trinity@gmail.com>2023-07-12 20:51:39 +0200
commitb6a0fa3518ad920946c60bb205277e8104fd1cf0 (patch)
treeb77a8958e9a7a8038f6bfc963121e1514332bd74 /src/tools/map_extractor
parent0cea730fa23473a85c47451c3bd13df816f2b6e4 (diff)
Tools: Updated db2 metadata used by extractors
Diffstat (limited to 'src/tools/map_extractor')
-rw-r--r--src/tools/map_extractor/System.cpp20
1 files changed, 10 insertions, 10 deletions
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<uint32, std::size_t> 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)