Tools/Extractor: Update extractors for 3.4.3

3 files changed, 6 insertions, 15 deletions

diff --git a/src/tools/vmap4_extractor/vmapexport.cpp b/src/tools/vmap4_extractor/vmapexport.cpp
index ef54f40d49f..5cc2c2cd36a 100644
--- a/src/tools/vmap4_extractor/vmapexport.cpp
+++ b/src/tools/vmap4_extractor/vmapexport.cpp
@@ -51,7 +51,6 @@ std::shared_ptr<CASC::Storage> CascStorage;
 struct MapEntry
 {
     uint32 Id = 0;
-    int32 WdtFileDataId = 0;
     int16 ParentMapID = 0;
     std::string Name;
     std::string Directory;
@@ -61,7 +60,7 @@ std::vector<MapEntry> map_ids; // partitioned by parent maps first
 std::unordered_set<uint32> maps_that_are_parents;
 boost::filesystem::path input_path;
 bool preciseVectorData = false;
-char const* CascProduct = "wow";
+char const* CascProduct = "wow_classic";
 char const* CascRegion = "eu";
 bool UseRemoteCasc = false;
 uint32 DbcLocale = 0;
@@ -276,13 +275,9 @@ void ParsMapFiles()
             if (mapEntryItr == map_ids.end())
                 return nullptr;
 
-            uint32 fileDataId = mapEntryItr->WdtFileDataId;
-            if (!fileDataId)
-                return nullptr;
-
-            std::string description = Trinity::StringFormat("WDT for map {} - {} (FileDataID {})", mapId, mapEntryItr->Name, fileDataId);
+            std::string fileName = Trinity::StringFormat("World\\Maps\\{}\\{}.wdt", mapEntryItr->Directory.c_str(), mapEntryItr->Directory.c_str());
             std::string directory = mapEntryItr->Directory;
-            itr = wdts.emplace(std::piecewise_construct, std::forward_as_tuple(mapId), std::forward_as_tuple(fileDataId, description, std::move(directory), maps_that_are_parents.count(mapId) > 0)).first;
+            itr = wdts.emplace(std::piecewise_construct, std::forward_as_tuple(mapId), std::forward_as_tuple(std::move(fileName), std::move(directory), maps_that_are_parents.count(mapId) > 0)).first;
             if (!itr->second.init(mapId))
             {
                 wdts.erase(itr);
@@ -546,7 +541,6 @@ int main(int argc, char ** argv)
 
             MapEntry map;
             map.Id = record.GetId();
-            map.WdtFileDataId = record.GetInt32("WdtFileDataID");
             map.ParentMapID = int16(record.GetUInt16("ParentMapID"));
             map.Name = record.GetString("MapName");
             map.Directory = record.GetString("Directory");
@@ -569,7 +563,6 @@ int main(int argc, char ** argv)
             {
                 MapEntry map;
                 map.Id = copy.NewRowId;
-                map.WdtFileDataId = map_ids[itr->second].WdtFileDataId;
                 map.ParentMapID = map_ids[itr->second].ParentMapID;
                 map.Name = map_ids[itr->second].Name;
                 map.Directory = map_ids[itr->second].Directory;
@@ -577,8 +570,6 @@ int main(int argc, char ** argv)
             }
         }
 
-        map_ids.erase(std::remove_if(map_ids.begin(), map_ids.end(), [](MapEntry const& map) { return !map.WdtFileDataId; }), map_ids.end());
-
         // force parent maps to be extracted first
         std::stable_partition(map_ids.begin(), map_ids.end(), [](MapEntry const& map) { return maps_that_are_parents.count(map.Id) > 0; });
 
diff --git a/src/tools/vmap4_extractor/wdtfile.cpp b/src/tools/vmap4_extractor/wdtfile.cpp
index cde22020a65..ec7a2168bec 100644
--- a/src/tools/vmap4_extractor/wdtfile.cpp
+++ b/src/tools/vmap4_extractor/wdtfile.cpp
@@ -25,8 +25,8 @@
 
 extern std::shared_ptr<CASC::Storage> CascStorage;
 
-WDTFile::WDTFile(uint32 fileDataId, std::string const& description, std::string mapName, bool cache)
-    : _file(CascStorage, fileDataId, description), _mapName(std::move(mapName))
+WDTFile::WDTFile(std::string fileName, std::string mapName, bool cache)
+    : _file(CascStorage, fileName.c_str()), _mapName(std::move(mapName))
 {
     memset(&_header, 0, sizeof(WDT::MPHD));
     memset(&_adtInfo, 0, sizeof(WDT::MAIN));
diff --git a/src/tools/vmap4_extractor/wdtfile.h b/src/tools/vmap4_extractor/wdtfile.h
index 47b111fd13e..1ddc3f94d6d 100644
--- a/src/tools/vmap4_extractor/wdtfile.h
+++ b/src/tools/vmap4_extractor/wdtfile.h
@@ -70,7 +70,7 @@ namespace WDT
 class WDTFile
 {
 public:
-    WDTFile(uint32 fileDataId, std::string const& description, std::string mapName, bool cache);
+    WDTFile(std::string fileName, std::string mapName, bool cache);
     ~WDTFile();
     bool init(uint32 mapId);