sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(Core): fix some warnings from VS (#4049)

Browse Source
This commit is contained in:
Kitzunu
2021-01-12 17:39:18 +01:00
committed by GitHub
parent 7ecb42c287
commit 39b7a74823
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Chat/Channels/Channel.h
+3 -3
View File
@@ -139,7 +139,7 @@ class Channel
{ {
uint64 player; uint64 player;
uint8 flags; uint8 flags;
uint32 lastSpeakTime; // pussywizard uint64 lastSpeakTime; // pussywizard
Player* plrPtr; // pussywizard Player* plrPtr; // pussywizard
bool HasFlag(uint8 flag) const { return flags & flag; } bool HasFlag(uint8 flag) const { return flags & flag; }
@@ -164,9 +164,9 @@ class Channel
if (state) flags |= MEMBER_FLAG_MUTED; if (state) flags |= MEMBER_FLAG_MUTED;
else 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<uint64>(sWorld->GetGameTime()))
{ {
lastSpeakTime = sWorld->GetGameTime(); lastSpeakTime = sWorld->GetGameTime();
return true; return true;
src/server/game/World/World.h
+1 -1
View File
@@ -441,7 +441,7 @@ private:
std::string m_newCharString; std::string m_newCharString;
float rate_values[MAX_RATES]; 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]; bool m_bool_configs[BOOL_CONFIG_VALUE_COUNT];
float m_float_configs[FLOAT_CONFIG_VALUE_COUNT]; float m_float_configs[FLOAT_CONFIG_VALUE_COUNT];
typedef std::map<uint32, uint64> WorldStatesMap; typedef std::map<uint32, uint64> WorldStatesMap;