diff options
author | Francesco Borzì <borzifrancesco@gmail.com> | 2020-08-19 19:44:07 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-19 19:44:07 +0200 |
commit | 2bc832efe33222fdd7aa0c610a1446dcf8dfa58d (patch) | |
tree | 46674af20791844628be9b92c320444255bdcf5e /src/server | |
parent | 4e4a0013bc1979353fd8942291e5958f9d4f3e76 (diff) |
fix(CI/Core/ArenaSpectator): clang warnings + prevent new warnings (#3317)
Co-authored by @meerd
Diffstat (limited to 'src/server')
-rw-r--r-- | src/server/game/ArenaSpectator/ArenaSpectator.h | 12 | ||||
-rw-r--r-- | src/server/game/Handlers/CalendarHandler.cpp | 3 | ||||
-rw-r--r-- | src/server/scripts/Commands/cs_spectator.cpp | 1 |
3 files changed, 7 insertions, 9 deletions
diff --git a/src/server/game/ArenaSpectator/ArenaSpectator.h b/src/server/game/ArenaSpectator/ArenaSpectator.h index 80ffc53fae..9ed6e88eab 100644 --- a/src/server/game/ArenaSpectator/ArenaSpectator.h +++ b/src/server/game/ArenaSpectator/ArenaSpectator.h @@ -92,7 +92,7 @@ namespace ArenaSpectator { if (!IS_PLAYER_GUID(targetGUID)) return; - SendCommand(o, "%s0x%016lX;%s=%s;", SPECTATOR_ADDON_PREFIX, targetGUID, prefix, c); + SendCommand(o, "%s0x%016llX;%s=%s;", SPECTATOR_ADDON_PREFIX, (unsigned long long)targetGUID, prefix, c); } template<class T> @@ -100,7 +100,7 @@ namespace ArenaSpectator { if (!IS_PLAYER_GUID(targetGUID)) return; - SendCommand(o, "%s0x%016lX;%s=%u;", SPECTATOR_ADDON_PREFIX, targetGUID, prefix, t); + SendCommand(o, "%s0x%016llX;%s=%u;", SPECTATOR_ADDON_PREFIX, (unsigned long long)targetGUID, prefix, t); } template<class T> @@ -108,7 +108,7 @@ namespace ArenaSpectator { if (!IS_PLAYER_GUID(targetGUID)) return; - SendCommand(o, "%s0x%016lX;%s=0x%016lX;", SPECTATOR_ADDON_PREFIX, targetGUID, prefix, t); + SendCommand(o, "%s0x%016llX;%s=0x%016llX;", SPECTATOR_ADDON_PREFIX, (unsigned long long)targetGUID, prefix, (unsigned long long)t); } template<class T> @@ -116,7 +116,7 @@ namespace ArenaSpectator { if (!IS_PLAYER_GUID(targetGUID)) return; - SendCommand(o, "%s0x%016lX;%s=%u,%i;", SPECTATOR_ADDON_PREFIX, targetGUID, prefix, id, casttime); + SendCommand(o, "%s0x%016llX;%s=%u,%i;", SPECTATOR_ADDON_PREFIX, (unsigned long long)targetGUID, prefix, id, casttime); } template<class T> @@ -127,7 +127,7 @@ namespace ArenaSpectator if (const SpellInfo* si = sSpellMgr->GetSpellInfo(id)) if (si->SpellIconID == 1) return; - SendCommand(o, "%s0x%016lX;%s=%u,%u,%u;", SPECTATOR_ADDON_PREFIX, targetGUID, prefix, id, dur, maxdur); + SendCommand(o, "%s0x%016llX;%s=%u,%u,%u;", SPECTATOR_ADDON_PREFIX, (unsigned long long)targetGUID, prefix, id, dur, maxdur); } template<class T> @@ -135,7 +135,7 @@ namespace ArenaSpectator { if (!IS_PLAYER_GUID(targetGUID)) return; - SendCommand(o, "%s0x%016lX;%s=%u,%u,%i,%i,%u,%u,%u,0x%016lX;", SPECTATOR_ADDON_PREFIX, targetGUID, prefix, remove ? 1 : 0, stack, dur, maxdur, id, dispel, isDebuff ? 1 : 0, caster); + SendCommand(o, "%s0x%016llX;%s=%u,%u,%i,%i,%u,%u,%u,0x%016llX;", SPECTATOR_ADDON_PREFIX, (unsigned long long)targetGUID, prefix, remove ? 1 : 0, stack, dur, maxdur, id, dispel, isDebuff ? 1 : 0, (unsigned long long)caster); } void HandleResetCommand(Player* p) diff --git a/src/server/game/Handlers/CalendarHandler.cpp b/src/server/game/Handlers/CalendarHandler.cpp index 51b4868296..532ea7f311 100644 --- a/src/server/game/Handlers/CalendarHandler.cpp +++ b/src/server/game/Handlers/CalendarHandler.cpp @@ -28,7 +28,6 @@ Copied events should probably have a new owner #include "Player.h" #include "SocialMgr.h" #include "CalendarMgr.h" -#include "ObjectMgr.h" #include "ObjectAccessor.h" #include "DatabaseEnv.h" #include "GuildMgr.h" @@ -212,7 +211,7 @@ bool validUtf8String(WorldPacket& recvData, std::string& s, std::string action, { if (!utf8::is_valid(s.begin(), s.end())) { - sLog->outString("CalendarHandler: Player with guid %lu attempt to %s an event with invalid name or description (packet modification)", playerGUID, action.c_str()); + sLog->outString("CalendarHandler: Player with guid %llu attempt to %s an event with invalid name or description (packet modification)", (unsigned long long)playerGUID, action.c_str()); recvData.rfinish(); return false; } diff --git a/src/server/scripts/Commands/cs_spectator.cpp b/src/server/scripts/Commands/cs_spectator.cpp index 06ac648944..5373a23614 100644 --- a/src/server/scripts/Commands/cs_spectator.cpp +++ b/src/server/scripts/Commands/cs_spectator.cpp @@ -3,7 +3,6 @@ #include "ObjectMgr.h" #include "Chat.h" #include "AccountMgr.h" -#include "Language.h" #include "World.h" #include "Player.h" #include "Opcodes.h" |