diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/map_extractor/System.cpp | 2 | ||||
| -rw-r--r-- | src/tools/map_extractor/loadlib.cpp | 16 | ||||
| -rw-r--r-- | src/tools/vmap4_extractor/cascfile.cpp | 4 | ||||
| -rw-r--r-- | src/tools/vmap4_extractor/gameobject_extract.cpp | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp index 05e0867daa5..99c2ac3f5c6 100644 --- a/src/tools/map_extractor/System.cpp +++ b/src/tools/map_extractor/System.cpp @@ -1425,7 +1425,7 @@ uint32 GetInstalledLocalesMask() try { boost::filesystem::path const storage_dir(boost::filesystem::canonical(input_path) / "Data"); - CASC::StorageHandle storage = CASC::OpenStorage(storage_dir, 0, CONF_Product); + CASC::StorageHandle storage = CASC::OpenStorage(storage_dir, CASC_LOCALE_ALL_WOW, CONF_Product); if (!storage) return false; diff --git a/src/tools/map_extractor/loadlib.cpp b/src/tools/map_extractor/loadlib.cpp index 07f14ebbf84..fa6ac16edae 100644 --- a/src/tools/map_extractor/loadlib.cpp +++ b/src/tools/map_extractor/loadlib.cpp @@ -24,7 +24,7 @@ u_map_fcc MverMagic = { { 'R','E','V','M' } }; ChunkedFile::ChunkedFile() { - data = 0; + data = nullptr; data_size = 0; } @@ -36,7 +36,7 @@ ChunkedFile::~ChunkedFile() bool ChunkedFile::loadFile(CASC::StorageHandle const& mpq, std::string const& fileName, bool log) { free(); - CASC::FileHandle file = CASC::OpenFile(mpq, fileName.c_str(), CASC_LOCALE_ALL, log); + CASC::FileHandle file = CASC::OpenFile(mpq, fileName.c_str(), CASC_LOCALE_ALL_WOW, log); if (!file) return false; @@ -63,7 +63,7 @@ bool ChunkedFile::loadFile(CASC::StorageHandle const& mpq, std::string const& fi bool ChunkedFile::loadFile(CASC::StorageHandle const& mpq, uint32 fileDataId, std::string const& description, bool log) { free(); - CASC::FileHandle file = CASC::OpenFile(mpq, fileDataId, CASC_LOCALE_ALL, log); + CASC::FileHandle file = CASC::OpenFile(mpq, fileDataId, CASC_LOCALE_ALL_WOW, log); if (!file) return false; @@ -104,13 +104,13 @@ bool ChunkedFile::prepareLoadedData() void ChunkedFile::free() { - for (auto chunk : chunks) + for (auto& chunk : chunks) delete chunk.second; chunks.clear(); delete[] data; - data = 0; + data = nullptr; data_size = 0; } @@ -171,12 +171,12 @@ FileChunk* ChunkedFile::GetChunk(std::string const& name) if (std::distance(range.first, range.second) == 1) return range.first->second; - return NULL; + return nullptr; } FileChunk::~FileChunk() { - for (auto subchunk : subchunks) + for (auto& subchunk : subchunks) delete subchunk.second; subchunks.clear(); @@ -215,5 +215,5 @@ FileChunk* FileChunk::GetSubChunk(std::string const& name) if (std::distance(range.first, range.second) == 1) return range.first->second; - return NULL; + return nullptr; } diff --git a/src/tools/vmap4_extractor/cascfile.cpp b/src/tools/vmap4_extractor/cascfile.cpp index 5a87749e4cf..fa13299fb52 100644 --- a/src/tools/vmap4_extractor/cascfile.cpp +++ b/src/tools/vmap4_extractor/cascfile.cpp @@ -25,7 +25,7 @@ CASCFile::CASCFile(CASC::StorageHandle const& casc, const char* filename, bool w pointer(0), size(0) { - CASC::FileHandle file = CASC::OpenFile(casc, filename, CASC_LOCALE_ALL, false); + CASC::FileHandle file = CASC::OpenFile(casc, filename, CASC_LOCALE_ALL_WOW, false); if (!file) { if (warnNoExist || GetLastError() != ERROR_FILE_NOT_FOUND) @@ -43,7 +43,7 @@ CASCFile::CASCFile(CASC::StorageHandle const& casc, uint32 fileDataId, std::stri pointer(0), size(0) { - CASC::FileHandle file = CASC::OpenFile(casc, fileDataId, CASC_LOCALE_ALL, false); + CASC::FileHandle file = CASC::OpenFile(casc, fileDataId, CASC_LOCALE_ALL_WOW, false); if (!file) { if (warnNoExist || GetLastError() != ERROR_FILE_NOT_FOUND) diff --git a/src/tools/vmap4_extractor/gameobject_extract.cpp b/src/tools/vmap4_extractor/gameobject_extract.cpp index eb29ce8c9a2..acad36438aa 100644 --- a/src/tools/vmap4_extractor/gameobject_extract.cpp +++ b/src/tools/vmap4_extractor/gameobject_extract.cpp @@ -72,7 +72,7 @@ enum ModelTypes : uint32 bool GetHeaderMagic(std::string const& fileName, uint32* magic) { *magic = 0; - CASC::FileHandle file = CASC::OpenFile(CascStorage, fileName.c_str(), CASC_LOCALE_ALL); + CASC::FileHandle file = CASC::OpenFile(CascStorage, fileName.c_str(), CASC_LOCALE_ALL_WOW); if (!file) return false; |