diff options
| author | Shauren <shauren.trinity@gmail.com> | 2023-12-01 19:53:13 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2023-12-02 15:57:09 +0100 |
| commit | eb50b29ab3d95c713bdc5cb508ec06a69704921d (patch) | |
| tree | 48d50f659a2015e01af0d4c6556c43e8f6ba5544 /src/tools | |
| parent | e2b26f2038e40760a0f46ae587af9ec985d041eb (diff) | |
Core/Misc: Added windows version checks during startup to avoid confusion about crashes when running on unsupported OS
(cherry picked from commit 333630b7de15c4090392fcbbc1bc58da4d5fb138)
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/map_extractor/System.cpp | 3 | ||||
| -rw-r--r-- | src/tools/mmaps_generator/PathGenerator.cpp | 2 | ||||
| -rw-r--r-- | src/tools/vmap4_assembler/VMapAssembler.cpp | 3 | ||||
| -rw-r--r-- | src/tools/vmap4_extractor/vmapexport.cpp | 3 |
4 files changed, 11 insertions, 0 deletions
diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp index d5210560b10..25eb1a9f9e7 100644 --- a/src/tools/map_extractor/System.cpp +++ b/src/tools/map_extractor/System.cpp @@ -20,6 +20,7 @@ #include "Locales.h" #include "mpq_libmpq04.h" #include "StringFormat.h" +#include "Util.h" #include "adt.h" #include "wdt.h" @@ -1121,6 +1122,8 @@ inline void CloseMPQFiles() int main(int argc, char * arg[]) { + Trinity::VerifyOsVersion(); + Trinity::Locale::Init(); Trinity::Banner::Show("Map & DBC Extractor", [](char const* text) { printf("%s\n", text); }, nullptr); diff --git a/src/tools/mmaps_generator/PathGenerator.cpp b/src/tools/mmaps_generator/PathGenerator.cpp index d8693bce323..c24240ef205 100644 --- a/src/tools/mmaps_generator/PathGenerator.cpp +++ b/src/tools/mmaps_generator/PathGenerator.cpp @@ -298,6 +298,8 @@ std::unordered_map<uint32, uint8> LoadLiquid() int main(int argc, char** argv) { + Trinity::VerifyOsVersion(); + Trinity::Locale::Init(); Trinity::Banner::Show("MMAP generator", [](char const* text) { printf("%s\n", text); }, nullptr); diff --git a/src/tools/vmap4_assembler/VMapAssembler.cpp b/src/tools/vmap4_assembler/VMapAssembler.cpp index aedafb6d3da..38eb53ed9be 100644 --- a/src/tools/vmap4_assembler/VMapAssembler.cpp +++ b/src/tools/vmap4_assembler/VMapAssembler.cpp @@ -21,9 +21,12 @@ #include "TileAssembler.h" #include "Banner.h" #include "Locales.h" +#include "Util.h" int main(int argc, char* argv[]) { + Trinity::VerifyOsVersion(); + Trinity::Locale::Init(); Trinity::Banner::Show("VMAP assembler", [](char const* text) { std::cout << text << std::endl; }, nullptr); diff --git a/src/tools/vmap4_extractor/vmapexport.cpp b/src/tools/vmap4_extractor/vmapexport.cpp index 4b60199260f..8809c94a0fc 100644 --- a/src/tools/vmap4_extractor/vmapexport.cpp +++ b/src/tools/vmap4_extractor/vmapexport.cpp @@ -21,6 +21,7 @@ #include "StringFormat.h" #include "vmapexport.h" #include "Locales.h" +#include "Util.h" #include "wdtfile.h" #include "wmo.h" #include "mpq_libmpq04.h" @@ -407,6 +408,8 @@ bool processArgv(int argc, char ** argv, const char *versionString) int main(int argc, char ** argv) { + Trinity::VerifyOsVersion(); + Trinity::Locale::Init(); Trinity::Banner::Show("VMAP data extractor", [](char const* text) { printf("%s\n", text); }, nullptr); |
