From d54db19050dec116147544104d6e97be1b1dd11c Mon Sep 17 00:00:00 2001 From: MadMaxMangos Date: Wed, 10 Jan 2018 19:26:58 +0000 Subject: [PATCH] Fixed build --- dep | 2 +- src/tools/Extractor_projects/shared/ExtractorCommon.h | 2 +- src/tools/Extractor_projects/vmap-extractor/vmapexport.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dep b/dep index 8889f5fdc..2ca435ec6 160000 --- a/dep +++ b/dep @@ -1 +1 @@ -Subproject commit 8889f5fdcb1ec1fea89913a98b10d38fd26919ca +Subproject commit 2ca435ec6219a903412f4cef0dd7adae239a7232 diff --git a/src/tools/Extractor_projects/shared/ExtractorCommon.h b/src/tools/Extractor_projects/shared/ExtractorCommon.h index 1fc5658d9..225c3bcbe 100644 --- a/src/tools/Extractor_projects/shared/ExtractorCommon.h +++ b/src/tools/Extractor_projects/shared/ExtractorCommon.h @@ -45,7 +45,7 @@ bool shouldSkipMap(int mapID, bool m_skipContinents, bool m_skipJunkMaps, bool m uint32 const Builds[] = {13164, 13205, 13287, 13329, 13596, 13623, 13914, 14007, 14333, 14480, 14545, 15005, 15050, 15211, 15354, 15595, 0}; static uint32 CONF_TargetBuild = 15595; // 4.3.4.15595 -static char* const Locales[] = {"enGB", "enUS", "deDE", "esES", "frFR", "koKR", "zhCN", "zhTW", "enCN", "enTW", "esMX", "ruRU"}; +static char const* Locales[] = {"enGB", "enUS", "deDE", "esES", "frFR", "koKR", "zhCN", "zhTW", "enCN", "enTW", "esMX", "ruRU"}; #define LOCALES_COUNT 12 /// Enumerated Core Numbers diff --git a/src/tools/Extractor_projects/vmap-extractor/vmapexport.cpp b/src/tools/Extractor_projects/vmap-extractor/vmapexport.cpp index aa176f711..5ef10c72f 100644 --- a/src/tools/Extractor_projects/vmap-extractor/vmapexport.cpp +++ b/src/tools/Extractor_projects/vmap-extractor/vmapexport.cpp @@ -79,7 +79,7 @@ char const* CONF_mpq_list[] = #define LAST_DBC_IN_DATA_BUILD 13623 // after this build mpqs with dbc are back to locale folder -TCHAR* const LocalesT[] = +TCHAR const* LocalesT[] = { _T("enGB"), _T("enUS"), _T("deDE"), _T("esES"),