diff options
Diffstat (limited to 'src')
6 files changed, 17 insertions, 13 deletions
diff --git a/src/server/game/Server/Packets/CharacterPackets.h b/src/server/game/Server/Packets/CharacterPackets.h index 5fbe1426292..f2bec8e2510 100644 --- a/src/server/game/Server/Packets/CharacterPackets.h +++ b/src/server/game/Server/Packets/CharacterPackets.h @@ -401,7 +401,7 @@ namespace WorldPackets WorldPacket const* Write() override; ObjectGuid Player; - uint8 Result = -1; // 0 - full packet, != 0 - only guid + uint8 Result = 0; // 0 - full packet, != 0 - only guid PlayerGuidLookupData Data; }; } diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index 2554a9e09db..c0f97733d33 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -951,7 +951,7 @@ void WorldSession::ProcessQueryCallbacks() { _charEnumCallback.GetResult(result); - if (bool undelete = _charEnumCallback.GetParam()) + if (_charEnumCallback.GetParam()) HandleCharUndeleteEnum(result); else HandleCharEnum(result); diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp index 2c414413deb..5729cea131d 100644 --- a/src/server/game/Server/WorldSocket.cpp +++ b/src/server/game/Server/WorldSocket.cpp @@ -55,8 +55,8 @@ uint32 const SizeOfClientHeader[2][2] = uint32 const SizeOfServerHeader[2] = { sizeof(uint16) + sizeof(uint32), sizeof(uint32) }; WorldSocket::WorldSocket(tcp::socket&& socket) : Socket(std::move(socket)), - _authSeed(rand32()), _OverSpeedPings(0), _worldSession(nullptr), - _initialized(false), _type(CONNECTION_TYPE_REALM) + _type(CONNECTION_TYPE_REALM), _authSeed(rand32()), + _OverSpeedPings(0), _worldSession(nullptr), _initialized(false) { _headerBuffer.Resize(SizeOfClientHeader[0][0]); } @@ -184,11 +184,11 @@ bool WorldSocket::ReadHeaderHandler() if (_worldSession) { Player* player = _worldSession->GetPlayer(); - TC_LOG_ERROR("network", "WorldSocket::ReadHeaderHandler(): client (account: %u, char [%s, name: %s]) sent malformed packet (size: %hu, cmd: %u)", + TC_LOG_ERROR("network", "WorldSocket::ReadHeaderHandler(): client (account: %u, char [%s, name: %s]) sent malformed packet (size: %u, cmd: %u)", _worldSession->GetAccountId(), player ? player->GetGUID().ToString().c_str() : "GUID: Empty", player ? player->GetName().c_str() : "<none>", size, opcode); } else - TC_LOG_ERROR("network", "WorldSocket::ReadHeaderHandler(): client %s sent malformed packet (size: %hu, cmd: %u)", + TC_LOG_ERROR("network", "WorldSocket::ReadHeaderHandler(): client %s sent malformed packet (size: %u, cmd: %u)", GetRemoteIpAddress().to_string().c_str(), size, opcode); CloseSocket(); diff --git a/src/server/scripts/Commands/cs_battlenet_account.cpp b/src/server/scripts/Commands/cs_battlenet_account.cpp index 36e4d3fbf2c..79b57cb94ff 100644 --- a/src/server/scripts/Commands/cs_battlenet_account.cpp +++ b/src/server/scripts/Commands/cs_battlenet_account.cpp @@ -358,6 +358,8 @@ public: handler->PSendSysMessage(LANG_ACCOUNT_ALREADY_LINKED, gameAccountName.c_str()); handler->SetSentErrorMessage(true); break; + default: + break; } return true; @@ -387,6 +389,8 @@ public: handler->PSendSysMessage(LANG_ACCOUNT_BNET_NOT_LINKED, gameAccountName.c_str()); handler->SetSentErrorMessage(true); break; + default: + break; } return true; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp index 4b40660fafc..f736aa6ffbc 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp @@ -108,7 +108,7 @@ public: npc_twilight_flame_caller() : CreatureScript("npc_twilight_flame_caller" struct npc_twilight_flame_callerAI : public ScriptedAI { - npc_twilight_flame_callerAI(Creature* creature) : ScriptedAI(creature), _summons(me), _instance(creature->GetInstanceScript()) + npc_twilight_flame_callerAI(Creature* creature) : ScriptedAI(creature), _instance(creature->GetInstanceScript()), _summons(me) { Initialize(); } diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp index 477d3baf206..0535ac64a9f 100644 --- a/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp @@ -123,7 +123,7 @@ Position const AbovePlatformPos = { 1336.21f, 960.813f, 215.0f }; // TO-DO: // - Find out why NPCs summoned by boss are usually two times bigger than their normal size. -// - Find more sniffs and script Force Grip spell (79351) +// - Find more sniffs and script Force Grip spell (79351) class boss_high_priestess_azil : public CreatureScript { @@ -164,9 +164,9 @@ class boss_high_priestess_azil : public CreatureScript Talk(SAY_AGGRO); } - void JustDied(Unit* killer) override + void JustDied(Unit* /*killer*/) override { - me->Say(SAY_DEATH); + Talk(SAY_DEATH); } /* @@ -327,7 +327,7 @@ class boss_high_priestess_azil : public CreatureScript } }; -// 42428 - Devout Follower +// 42428 - Devout Follower class npc_devout_follower : public CreatureScript { public: @@ -515,7 +515,7 @@ public: { Unit* caster = GetCaster(); for (uint8 i = 0; i < 3; i++) - GetCaster()->CastSpell(GetCaster(), SPELL_SUMMON_ADD_SOUTH, true); + caster->CastSpell(caster, SPELL_SUMMON_ADD_SOUTH, true); } void Register() override @@ -551,7 +551,7 @@ public: { Unit* caster = GetCaster(); for (uint8 i = 0; i < 10; i++) - GetCaster()->CastSpell(GetCaster(), SPELL_SUMMON_ADD_WEST, true); + caster->CastSpell(caster, SPELL_SUMMON_ADD_WEST, true); } void Register() override |