Core/Misc: MSVC warning fixes

5 files changed, 19 insertions, 19 deletions

diff --git a/src/common/Collision/Management/MMapManager.h b/src/common/Collision/Management/MMapManager.h
index 8aa28ec7ab4..bcc19b92a4e 100644
--- a/src/common/Collision/Management/MMapManager.h
+++ b/src/common/Collision/Management/MMapManager.h
@@ -107,7 +107,7 @@ namespace MMAP
             dtNavMesh const* GetNavMesh(uint32 mapId, TerrainSet swaps);
 
             uint32 getLoadedTilesCount() const { return loadedTiles; }
-            uint32 getLoadedMapsCount() const { return loadedMMaps.size(); }
+            uint32 getLoadedMapsCount() const { return uint32(loadedMMaps.size()); }
 
             typedef std::unordered_map<uint32, std::vector<uint32>> PhaseChildMapContainer;
             void LoadPhaseTiles(PhaseChildMapContainer::const_iterator phasedMapData, int32 x, int32 y);
diff --git a/src/common/Logging/Appender.h b/src/common/Logging/Appender.h
index 22fe1112239..d24daa2b60d 100644
--- a/src/common/Logging/Appender.h
+++ b/src/common/Logging/Appender.h
@@ -41,7 +41,7 @@ enum LogLevel
 
 const uint8 MaxLogLevels = 6;
 
-enum AppenderType
+enum AppenderType : uint8
 {
     APPENDER_NONE,
     APPENDER_CONSOLE,
diff --git a/src/common/Utilities/EventMap.h b/src/common/Utilities/EventMap.h
index bb40980181d..6a314a9e633 100644
--- a/src/common/Utilities/EventMap.h
+++ b/src/common/Utilities/EventMap.h
@@ -122,7 +122,7 @@ public:
     */
     void ScheduleEvent(uint32 eventId, Milliseconds const& time, uint32 group = 0, uint8 phase = 0)
     {
-        ScheduleEvent(eventId, time.count(), group, phase);
+        ScheduleEvent(eventId, uint32(time.count()), group, phase);
     }
 
     /**
@@ -145,7 +145,7 @@ public:
     */
     void RescheduleEvent(uint32 eventId, Milliseconds const& time, uint32 group = 0, uint8 phase = 0)
     {
-        RescheduleEvent(eventId, time.count(), group, phase);
+        RescheduleEvent(eventId, uint32(time.count()), group, phase);
     }
 
     /**
@@ -169,7 +169,7 @@ public:
     */
     void Repeat(Milliseconds const& time)
     {
-        Repeat(time.count());
+        Repeat(uint32(time.count()));
     }
 
     /**
@@ -190,7 +190,7 @@ public:
     */
     void Repeat(Milliseconds const& minTime, Milliseconds const& maxTime)
     {
-        Repeat(minTime.count(), maxTime.count());
+        Repeat(uint32(minTime.count()), uint32(maxTime.count()));
     }
 
     /**
@@ -218,7 +218,7 @@ public:
     */
     void DelayEvents(Milliseconds const& delay)
     {
-        DelayEvents(delay.count());
+        DelayEvents(uint32(delay.count()));
     }
 
     /**
@@ -239,7 +239,7 @@ public:
     */
     void DelayEvents(Milliseconds const& delay, uint32 group)
     {
-        DelayEvents(delay.count(), group);
+        DelayEvents(uint32(delay.count()), group);
     }
 
     /**
diff --git a/src/common/Utilities/TaskScheduler.h b/src/common/Utilities/TaskScheduler.h
index c5163ef33d5..6784c968683 100644
--- a/src/common/Utilities/TaskScheduler.h
+++ b/src/common/Utilities/TaskScheduler.h
@@ -401,7 +401,7 @@ private:
         auto const milli_max = std::chrono::duration_cast<std::chrono::milliseconds>(max);
 
         // TC specific: use SFMT URandom
-        return std::chrono::milliseconds(urand(milli_min.count(), milli_max.count()));
+        return std::chrono::milliseconds(urand(uint32(milli_min.count()), uint32(milli_max.count())));
     }
 
     /// Dispatch remaining tasks
diff --git a/src/common/Utilities/Util.cpp b/src/common/Utilities/Util.cpp
index 25bd935de92..28ffc891034 100644
--- a/src/common/Utilities/Util.cpp
+++ b/src/common/Utilities/Util.cpp
@@ -426,7 +426,7 @@ bool utf8ToConsole(const std::string& utf8str, std::string& conStr)
         return false;
 
     conStr.resize(wstr.size());
-    CharToOemBuffW(&wstr[0], &conStr[0], wstr.size());
+    CharToOemBuffW(&wstr[0], &conStr[0], uint32(wstr.size()));
 #else
     // not implemented yet
     conStr = utf8str;
@@ -440,7 +440,7 @@ bool consoleToUtf8(const std::string& conStr, std::string& utf8str)
 #if PLATFORM == PLATFORM_WINDOWS
     std::wstring wstr;
     wstr.resize(conStr.size());
-    OemToCharBuffW(&conStr[0], &wstr[0], conStr.size());
+    OemToCharBuffW(&conStr[0], &wstr[0], uint32(conStr.size()));
 
     return WStrToUtf8(wstr, utf8str);
 #else
@@ -458,7 +458,7 @@ bool Utf8FitTo(const std::string& str, std::wstring const& search)
         return false;
 
     // converting to lower case
-    wstrToLower( temp );
+    wstrToLower(temp);
 
     if (temp.find(search) == std::wstring::npos)
         return false;
@@ -477,10 +477,10 @@ void utf8printf(FILE* out, const char *str, ...)
 void vutf8printf(FILE* out, const char *str, va_list* ap)
 {
 #if PLATFORM == PLATFORM_WINDOWS
-    char temp_buf[32*1024];
-    wchar_t wtemp_buf[32*1024];
+    char temp_buf[32 * 1024];
+    wchar_t wtemp_buf[32 * 1024];
 
-    size_t temp_len = vsnprintf(temp_buf, 32*1024, str, *ap);
+    size_t temp_len = vsnprintf(temp_buf, 32 * 1024, str, *ap);
     //vsnprintf returns -1 if the buffer is too small
     if (temp_len == size_t(-1))
         temp_len = 32*1024-1;
@@ -488,7 +488,7 @@ void vutf8printf(FILE* out, const char *str, va_list* ap)
     size_t wtemp_len = 32*1024-1;
     Utf8toWStr(temp_buf, temp_len, wtemp_buf, wtemp_len);
 
-    CharToOemBuffW(&wtemp_buf[0], &temp_buf[0], wtemp_len+1);
+    CharToOemBuffW(&wtemp_buf[0], &temp_buf[0], uint32(wtemp_len + 1));
     fprintf(out, "%s", temp_buf);
 #else
     vfprintf(out, str, *ap);
@@ -537,12 +537,12 @@ void HexStrToByteArray(std::string const& str, uint8* out, bool reverse /*= fals
         return;
 
     int32 init = 0;
-    int32 end = str.length();
+    int32 end = int32(str.length());
     int8 op = 1;
 
     if (reverse)
     {
-        init = str.length() - 2;
+        init = int32(str.length() - 2);
         end = -2;
         op = -1;
     }
@@ -551,7 +551,7 @@ void HexStrToByteArray(std::string const& str, uint8* out, bool reverse /*= fals
     for (int32 i = init; i != end; i += 2 * op)
     {
         char buffer[3] = { str[i], str[i + 1], '\0' };
-        out[j++] = strtoul(buffer, NULL, 16);
+        out[j++] = uint8(strtoul(buffer, NULL, 16));
     }
 }