From 39b7a74823d9c47adbd49b81dc778696dc51c747 Mon Sep 17 00:00:00 2001 From: Kitzunu <24550914+Kitzunu@users.noreply.github.com> Date: Tue, 12 Jan 2021 17:39:18 +0100 Subject: [PATCH] refactor(Core): fix some warnings from VS (#4049) --- src/server/game/Chat/Channels/Channel.h | 6 +++--- src/server/game/World/World.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/server/game/Chat/Channels/Channel.h b/src/server/game/Chat/Channels/Channel.h index c611d353e..1e9dc30da 100644 --- a/src/server/game/Chat/Channels/Channel.h +++ b/src/server/game/Chat/Channels/Channel.h @@ -139,7 +139,7 @@ class Channel { uint64 player; uint8 flags; - uint32 lastSpeakTime; // pussywizard + uint64 lastSpeakTime; // pussywizard Player* plrPtr; // pussywizard bool HasFlag(uint8 flag) const { return flags & flag; } @@ -164,9 +164,9 @@ class Channel if (state) flags |= MEMBER_FLAG_MUTED; else flags &= ~MEMBER_FLAG_MUTED; } - bool IsAllowedToSpeak(uint32 speakDelay) // pussywizard + bool IsAllowedToSpeak(uint64 speakDelay) // pussywizard { - if (lastSpeakTime + speakDelay <= sWorld->GetGameTime()) + if (lastSpeakTime + speakDelay <= static_cast(sWorld->GetGameTime())) { lastSpeakTime = sWorld->GetGameTime(); return true; diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index 9fc318bd9..26fdf9770 100644 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -441,7 +441,7 @@ private: std::string m_newCharString; float rate_values[MAX_RATES]; - uint32 m_int_configs[INT_CONFIG_VALUE_COUNT]; + uint64 m_int_configs[INT_CONFIG_VALUE_COUNT]; bool m_bool_configs[BOOL_CONFIG_VALUE_COUNT]; float m_float_configs[FLOAT_CONFIG_VALUE_COUNT]; typedef std::map WorldStatesMap;