diff options
Diffstat (limited to 'src')
8 files changed, 69 insertions, 81 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 019e69ce5ad..2cfdaf84205 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -854,7 +854,7 @@ Player::Player (WorldSession* session): Unit(), m_achievementMgr(this), m_reputa isDebugAreaTriggers = false; - SetPendingBind(NULL, 0); + SetPendingBind(0, 0); } Player::~Player () @@ -1756,7 +1756,7 @@ void Player::Update(uint32 p_time) // Player left the instance if (_pendingBindId == GetInstanceId()) BindToInstance(); - SetPendingBind(NULL, 0); + SetPendingBind(0, 0); } else _pendingBindTimer -= p_time; diff --git a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp index df8e047c825..f8752d9b167 100755 --- a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp @@ -789,47 +789,47 @@ void WorldSession::SendAreaTriggerMessage(const char* Text, ...) SendPacket(&data); } -void WorldSession::HandleAreaTriggerOpcode(WorldPacket & recv_data) +void WorldSession::HandleAreaTriggerOpcode(WorldPacket& recv_data) { - sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_AREATRIGGER"); + uint32 triggerId; + recv_data >> triggerId; - uint32 Trigger_ID; + sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_AREATRIGGER. Trigger ID: %u", triggerId); - recv_data >> Trigger_ID; - sLog->outDebug(LOG_FILTER_NETWORKIO, "Trigger ID:%u", Trigger_ID); - - if (GetPlayer()->isInFlight()) + Player* player = GetPlayer(); + if (player->isInFlight()) { - sLog->outDebug(LOG_FILTER_NETWORKIO, "Player '%s' (GUID: %u) in flight, ignore Area Trigger ID:%u", GetPlayer()->GetName(), GetPlayer()->GetGUIDLow(), Trigger_ID); + sLog->outDebug(LOG_FILTER_NETWORKIO, "Player '%s' (GUID: %u) in flight, ignore Area Trigger ID:%u", + player->GetName(), player->GetGUIDLow(), triggerId); return; } - AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(Trigger_ID); + AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(triggerId); if (!atEntry) { - sLog->outDebug(LOG_FILTER_NETWORKIO, "Player '%s' (GUID: %u) send unknown (by DBC) Area Trigger ID:%u", GetPlayer()->GetName(), GetPlayer()->GetGUIDLow(), Trigger_ID); + sLog->outDebug(LOG_FILTER_NETWORKIO, "Player '%s' (GUID: %u) send unknown (by DBC) Area Trigger ID:%u", + player->GetName(), player->GetGUIDLow(), triggerId); return; } - if (GetPlayer()->GetMapId() != atEntry->mapid) + if (player->GetMapId() != atEntry->mapid) { - sLog->outDebug(LOG_FILTER_NETWORKIO, "Player '%s' (GUID: %u) too far (trigger map: %u player map: %u), ignore Area Trigger ID: %u", GetPlayer()->GetName(), atEntry->mapid, GetPlayer()->GetMapId(), GetPlayer()->GetGUIDLow(), Trigger_ID); + sLog->outDebug(LOG_FILTER_NETWORKIO, "Player '%s' (GUID: %u) too far (trigger map: %u player map: %u), ignore Area Trigger ID: %u", + player->GetName(), atEntry->mapid, player->GetMapId(), player->GetGUIDLow(), triggerId); return; } // delta is safe radius const float delta = 5.0f; - // check if player in the range of areatrigger - Player* pl = GetPlayer(); if (atEntry->radius > 0) { // if we have radius check it - float dist = pl->GetDistance(atEntry->x, atEntry->y, atEntry->z); + float dist = player->GetDistance(atEntry->x, atEntry->y, atEntry->z); if (dist > atEntry->radius + delta) { sLog->outDebug(LOG_FILTER_NETWORKIO, "Player '%s' (GUID: %u) too far (radius: %f distance: %f), ignore Area Trigger ID: %u", - pl->GetName(), pl->GetGUIDLow(), atEntry->radius, dist, Trigger_ID); + player->GetName(), player->GetGUIDLow(), atEntry->radius, dist, triggerId); return; } } @@ -841,93 +841,82 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPacket & recv_data) // is-in-cube check and we have to calculate only one point instead of 4 // 2PI = 360°, keep in mind that ingame orientation is counter-clockwise - double rotation = 2*M_PI-atEntry->box_orientation; + double rotation = 2 * M_PI - atEntry->box_orientation; double sinVal = sin(rotation); double cosVal = cos(rotation); - float playerBoxDistX = pl->GetPositionX() - atEntry->x; - float playerBoxDistY = pl->GetPositionY() - atEntry->y; + float playerBoxDistX = player->GetPositionX() - atEntry->x; + float playerBoxDistY = player->GetPositionY() - atEntry->y; - float rotPlayerX = (float)(atEntry->x + playerBoxDistX * cosVal - playerBoxDistY*sinVal); - float rotPlayerY = (float)(atEntry->y + playerBoxDistY * cosVal + playerBoxDistX*sinVal); + float rotPlayerX = float(atEntry->x + playerBoxDistX * cosVal - playerBoxDistY*sinVal); + float rotPlayerY = float(atEntry->y + playerBoxDistY * cosVal + playerBoxDistX*sinVal); // box edges are parallel to coordiante axis, so we can treat every dimension independently :D - float dz = pl->GetPositionZ() - atEntry->z; + float dz = player->GetPositionZ() - atEntry->z; float dx = rotPlayerX - atEntry->x; float dy = rotPlayerY - atEntry->y; - if ((fabs(dx) > atEntry->box_x/2 + delta) || - (fabs(dy) > atEntry->box_y/2 + delta) || - (fabs(dz) > atEntry->box_z/2 + delta)) + if ((fabs(dx) > atEntry->box_x / 2 + delta) || + (fabs(dy) > atEntry->box_y / 2 + delta) || + (fabs(dz) > atEntry->box_z / 2 + delta)) { sLog->outDebug(LOG_FILTER_NETWORKIO, "Player '%s' (GUID: %u) too far (1/2 box X: %f 1/2 box Y: %f 1/2 box Z: %f rotatedPlayerX: %f rotatedPlayerY: %f dZ:%f), ignore Area Trigger ID: %u", - pl->GetName(), pl->GetGUIDLow(), atEntry->box_x/2, atEntry->box_y/2, atEntry->box_z/2, rotPlayerX, rotPlayerY, dz, Trigger_ID); + player->GetName(), player->GetGUIDLow(), atEntry->box_x/2, atEntry->box_y/2, atEntry->box_z/2, rotPlayerX, rotPlayerY, dz, triggerId); return; } } - if (GetPlayer()->isDebugAreaTriggers) - ChatHandler(GetPlayer()).PSendSysMessage(LANG_DEBUG_AREATRIGGER_REACHED, Trigger_ID); + if (player->isDebugAreaTriggers) + ChatHandler(player).PSendSysMessage(LANG_DEBUG_AREATRIGGER_REACHED, triggerId); - if (sScriptMgr->OnAreaTrigger(GetPlayer(), atEntry)) + if (sScriptMgr->OnAreaTrigger(player, atEntry)) return; - uint32 quest_id = sObjectMgr->GetQuestForAreaTrigger(Trigger_ID); - if (quest_id && GetPlayer()->isAlive() && GetPlayer()->IsActiveQuest(quest_id)) - { - Quest const* pQuest = sObjectMgr->GetQuestTemplate(quest_id); - if (pQuest) - { - if (GetPlayer()->GetQuestStatus(quest_id) == QUEST_STATUS_INCOMPLETE) - GetPlayer()->AreaExploredOrEventHappens(quest_id); - } - } + if (player->isAlive()) + if (uint32 questId = sObjectMgr->GetQuestForAreaTrigger(triggerId)) + if (player->GetQuestStatus(questId) == QUEST_STATUS_INCOMPLETE) + player->AreaExploredOrEventHappens(questId); - if (sObjectMgr->IsTavernAreaTrigger(Trigger_ID)) + if (sObjectMgr->IsTavernAreaTrigger(triggerId)) { // set resting flag we are in the inn - GetPlayer()->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING); - GetPlayer()->InnEnter(time(NULL), atEntry->mapid, atEntry->x, atEntry->y, atEntry->z); - GetPlayer()->SetRestType(REST_TYPE_IN_TAVERN); + player->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING); + player->InnEnter(time(NULL), atEntry->mapid, atEntry->x, atEntry->y, atEntry->z); + player->SetRestType(REST_TYPE_IN_TAVERN); if (sWorld->IsFFAPvPRealm()) - GetPlayer()->RemoveByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP); + player->RemoveByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP); return; } - if (GetPlayer()->InBattleground()) - { - Battleground* bg = GetPlayer()->GetBattleground(); - if (bg) - if (bg->GetStatus() == STATUS_IN_PROGRESS) - bg->HandleAreaTrigger(GetPlayer(), Trigger_ID); - - return; - } + if (Battleground* bg = player->GetBattleground()) + if (bg->GetStatus() == STATUS_IN_PROGRESS) + { + bg->HandleAreaTrigger(player, triggerId); + return; + } - if (OutdoorPvP* pvp = GetPlayer()->GetOutdoorPvP()) - { - if (pvp->HandleAreaTrigger(_player, Trigger_ID)) + if (OutdoorPvP* pvp = player->GetOutdoorPvP()) + if (pvp->HandleAreaTrigger(_player, triggerId)) return; - } - // NULL if all values default (non teleport trigger) - AreaTrigger const* at = sObjectMgr->GetAreaTrigger(Trigger_ID); + AreaTrigger const* at = sObjectMgr->GetAreaTrigger(triggerId); if (!at) return; - // Check only if target map != current player's map - // check if player can enter instance : instance not full, and raid instance not in encounter fight - if (GetPlayer()->GetMapId() != at->target_mapId && !sMapMgr->CanPlayerEnter(at->target_mapId, GetPlayer(), false)) - return; - - // Check if we are in LfgGroup and trying to get out the dungeon bool teleported = false; - if (GetPlayer()->GetGroup() && GetPlayer()->GetGroup()->isLFGGroup() && GetPlayer()->GetMap()->IsDungeon() && at->target_mapId != GetPlayer()->GetMapId()) - teleported = GetPlayer()->TeleportToBGEntryPoint(); + if (player->GetMapId() != at->target_mapId) + { + if (!sMapMgr->CanPlayerEnter(at->target_mapId, player, false)) + return; + + if (Group* group = player->GetGroup()) + if (group->isLFGGroup() && player->GetMap()->IsDungeon()) + teleported = player->TeleportToBGEntryPoint(); + } if (!teleported) - GetPlayer()->TeleportTo(at->target_mapId, at->target_X, at->target_Y, at->target_Z, at->target_Orientation, TELE_TO_NOT_LEAVE_TRANSPORT); + player->TeleportTo(at->target_mapId, at->target_X, at->target_Y, at->target_Z, at->target_Orientation, TELE_TO_NOT_LEAVE_TRANSPORT); } void WorldSession::HandleUpdateAccountData(WorldPacket &recv_data) @@ -1724,5 +1713,5 @@ void WorldSession::HandleInstanceLockResponse(WorldPacket& recvPacket) else _player->RepopAtGraveyard(); - _player->SetPendingBind(NULL, 0); + _player->SetPendingBind(0, 0); } diff --git a/src/server/game/Server/Protocol/Handlers/VehicleHandler.cpp b/src/server/game/Server/Protocol/Handlers/VehicleHandler.cpp index 59940111fbe..7187241cc3a 100644 --- a/src/server/game/Server/Protocol/Handlers/VehicleHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/VehicleHandler.cpp @@ -207,7 +207,7 @@ void WorldSession::HandleEjectPassenger(WorldPacket &data) sLog->outError("HandleEjectPassenger: Player %u tried to eject invalid GUID "UI64FMTD, GetPlayer()->GetGUIDLow(), guid); } -void WorldSession::HandleRequestVehicleExit(WorldPacket &recv_data) +void WorldSession::HandleRequestVehicleExit(WorldPacket& /*recv_data*/) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_REQUEST_VEHICLE_EXIT"); diff --git a/src/server/game/Server/Protocol/Handlers/VoiceChatHandler.cpp b/src/server/game/Server/Protocol/Handlers/VoiceChatHandler.cpp index de65d165bff..be8307b29b1 100755 --- a/src/server/game/Server/Protocol/Handlers/VoiceChatHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/VoiceChatHandler.cpp @@ -22,7 +22,7 @@ #include "Opcodes.h" #include "Log.h" -void WorldSession::HandleVoiceSessionEnableOpcode(WorldPacket & recv_data) +void WorldSession::HandleVoiceSessionEnableOpcode(WorldPacket& recv_data) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_VOICE_SESSION_ENABLE"); // uint8 isVoiceEnabled, uint8 isMicrophoneEnabled @@ -30,13 +30,13 @@ void WorldSession::HandleVoiceSessionEnableOpcode(WorldPacket & recv_data) recv_data.read_skip<uint8>(); } -void WorldSession::HandleChannelVoiceOnOpcode(WorldPacket & recv_data) +void WorldSession::HandleChannelVoiceOnOpcode(WorldPacket& /*recv_data*/) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_CHANNEL_VOICE_ON"); // Enable Voice button in channel context menu } -void WorldSession::HandleSetActiveVoiceChannel(WorldPacket & recv_data) +void WorldSession::HandleSetActiveVoiceChannel(WorldPacket& recv_data) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_SET_ACTIVE_VOICE_CHANNEL"); recv_data.read_skip<uint32>(); diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index f5fa153bfd9..80af3961caf 100755 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -413,7 +413,7 @@ void WorldSession::LogoutPlayer(bool Save) else if (_player->HasPendingBind()) { _player->RepopAtGraveyard(); - _player->SetPendingBind(NULL, 0); + _player->SetPendingBind(0, 0); } //drop a flag if player is carrying it diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 7be3e1f2fa0..e6c22b7442f 100755 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -4742,7 +4742,7 @@ SpellCastResult Spell::CheckCast(bool strict) // those spells may have incorrect target entries or not filled at all (for example 15332) // such spells when learned are not targeting anyone using targeting system, they should apply directly to caster instead // also, such casts shouldn't be sent to client - if (!((m_spellInfo->Attributes & SPELL_ATTR0_PASSIVE) && !m_targets.GetUnitTarget() || m_targets.GetUnitTarget() == m_caster)) + if (!(((m_spellInfo->Attributes & SPELL_ATTR0_PASSIVE) && !m_targets.GetUnitTarget()) || m_targets.GetUnitTarget() == m_caster)) { // Check explicit target for m_originalCaster - todo: get rid of such workarounds SpellCastResult castResult = m_spellInfo->CheckExplicitTarget(m_originalCaster ? m_originalCaster : m_caster, m_targets.GetObjectTarget(), m_targets.GetItemTarget()); diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp index 79b989c3c18..9126df968e2 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp @@ -101,7 +101,6 @@ class boss_sulfuron : public CreatureScript break; case EVENT_INSPIRE: { - Creature* target = NULL; std::list<Creature*> healers = DoFindFriendlyMissingBuff(45.0f, SPELL_INSPIRE); if (!healers.empty()) DoCast(SelectRandomContainerElement(healers), SPELL_INSPIRE); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index 6f6e4c5b8f4..d5dd7cf27dd 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -648,7 +648,7 @@ public: else m_uiRangeCheckTimer -= uiDiff; } - void SpellHitTarget(Unit* who, const SpellInfo* spell) + void SpellHitTarget(Unit* who, const SpellInfo* /*spell*/) { if (who->HasAura(SPELL_DARK_ESSENCE_HELPER)) who->CastSpell(who, SPELL_POWERING_UP, true); @@ -687,7 +687,7 @@ public: else m_uiRangeCheckTimer -= uiDiff; } - void SpellHitTarget(Unit* who, const SpellInfo* spell) + void SpellHitTarget(Unit* who, const SpellInfo* /*spell*/) { if (who->HasAura(SPELL_LIGHT_ESSENCE_HELPER)) who->CastSpell(who, SPELL_POWERING_UP, true); @@ -821,7 +821,7 @@ class spell_power_of_the_twins : public SpellScriptLoader return GetCaster()->GetTypeId() == TYPEID_UNIT; } - void HandleEffectApply(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) + void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (InstanceScript* instance = GetCaster()->GetInstanceScript()) { |