diff options
Diffstat (limited to 'src')
21 files changed, 39 insertions, 39 deletions
diff --git a/src/server/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp index 873929e8cfb..a1799c34723 100644 --- a/src/server/game/AI/CoreAI/PetAI.cpp +++ b/src/server/game/AI/CoreAI/PetAI.cpp @@ -148,7 +148,7 @@ void PetAI::UpdateAI(uint32 diff) if (me->GetCharmInfo() && me->GetSpellHistory()->HasGlobalCooldown(spellInfo)) continue; - + // check spell cooldown if (!me->GetSpellHistory()->IsReady(spellInfo)) continue; diff --git a/src/server/game/AuctionHouseBot/AuctionHouseBotSeller.cpp b/src/server/game/AuctionHouseBot/AuctionHouseBotSeller.cpp index 23125d82734..8a45d40988d 100644 --- a/src/server/game/AuctionHouseBot/AuctionHouseBotSeller.cpp +++ b/src/server/game/AuctionHouseBot/AuctionHouseBotSeller.cpp @@ -725,10 +725,10 @@ void AuctionBotSeller::SetPricesOfItem(ItemTemplate const* itemProto, SellerConf if (sAuctionBotConfig->GetConfig(CONFIG_AHBOT_BUYPRICE_SELLER)) buyPrice = sellPrice; - + float basePriceFloat = (buyPrice * stackCount * priceRatio) / (itemProto->GetClass() == 6 ? 200.0f : static_cast<float>(itemProto->GetBuyCount())) / 100.0f; float range = basePriceFloat * 0.04f; - + buyp = static_cast<uint32>(frand(basePriceFloat - range, basePriceFloat + range) + 0.5f); if (buyp == 0) buyp = 1; diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 6fa126371e9..3605004e29d 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -10847,7 +10847,7 @@ Unit* Creature::SelectVictim() if (target && _IsTargetAcceptable(target) && CanCreatureAttack(target)) { - if(!IsFocusing()) + if (!IsFocusing()) SetInFront(target); return target; } diff --git a/src/server/game/Handlers/NPCHandler.cpp b/src/server/game/Handlers/NPCHandler.cpp index 32cd3e6daa9..ef1155a38b2 100644 --- a/src/server/game/Handlers/NPCHandler.cpp +++ b/src/server/game/Handlers/NPCHandler.cpp @@ -514,7 +514,7 @@ void WorldSession::SendStablePetCallback(PreparedQueryResult result, ObjectGuid stableEntry.DisplayID = pet->GetDisplayId(); stableEntry.ExperienceLevel = pet->getLevel(); stableEntry.PetFlags = PET_STABLE_ACTIVE; - stableEntry.PetName = pet->GetName(); + stableEntry.PetName = pet->GetName(); ++petSlot; packet.Pets.push_back(stableEntry); diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index da9cbed9374..82f54208632 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -306,7 +306,7 @@ void MotionMaster::MoveCloserAndStop(uint32 id, Unit* target, float distance) float desty = _owner->GetPositionY() + distanceToTravel * std::sin(angle); MovePoint(id, destx, desty, target->GetPositionZ()); } - else + else { // we are already close enough. We just need to turn toward the target without changing position. Movement::MoveSplineInit init(_owner); diff --git a/src/server/game/Movement/MotionMaster.h b/src/server/game/Movement/MotionMaster.h index 07c928da63b..d2e5d82f084 100644 --- a/src/server/game/Movement/MotionMaster.h +++ b/src/server/game/Movement/MotionMaster.h @@ -173,7 +173,7 @@ class TC_GAME_API MotionMaster //: private std::stack<MovementGenerator *> { MovePoint(id, pos.m_positionX, pos.m_positionY, pos.m_positionZ, generatePath); } void MovePoint(uint32 id, float x, float y, float z, bool generatePath = true); - /* Makes the unit move toward the target until it is at a certain distance from it. The unit then stops. + /* Makes the unit move toward the target until it is at a certain distance from it. The unit then stops. Only works in 2D. This method doesn't account for any movement done by the target. in other words, it only works if the target is stationary. */ diff --git a/src/server/game/Scripting/ScriptReloadMgr.cpp b/src/server/game/Scripting/ScriptReloadMgr.cpp index aac0e26f02b..abaae1f958b 100644 --- a/src/server/game/Scripting/ScriptReloadMgr.cpp +++ b/src/server/game/Scripting/ScriptReloadMgr.cpp @@ -984,7 +984,7 @@ private: return; } - + // Find all source files of a changed script module and removes // it from the changed source list, invoke the build afterwards. bool rebuild_buildfiles; @@ -1056,7 +1056,7 @@ private: ASSERT(_build_job->IsValid(), "Invalid build job!"); // Retrieve the result - auto const error = _build_job->GetProcess()->GetFutureResult().get(); + auto const error = _build_job->GetProcess()->GetFutureResult().get(); if (terminate_early) { @@ -1144,7 +1144,7 @@ private: TC_LOG_INFO("scripts.hotswap", "Rerunning CMake because there were sources added or removed..."); - _build_job->UpdateCurrentJob(BuildJobType::BUILD_JOB_RERUN_CMAKE, + _build_job->UpdateCurrentJob(BuildJobType::BUILD_JOB_RERUN_CMAKE, InvokeAsyncCMakeCommand(BuiltInConfig::GetBuildDirectory())); } diff --git a/src/server/game/Server/Packets/ChatPackets.cpp b/src/server/game/Server/Packets/ChatPackets.cpp index 612b46ca919..fd1cbeb62a6 100644 --- a/src/server/game/Server/Packets/ChatPackets.cpp +++ b/src/server/game/Server/Packets/ChatPackets.cpp @@ -276,7 +276,7 @@ WorldPacket const* WorldPackets::Chat::ChatPlayerAmbiguous::Write() { _worldPacket.WriteBits(Name.length(), 9); _worldPacket.WriteString(Name); - + return &_worldPacket; } diff --git a/src/server/game/Server/Packets/NPCPackets.h b/src/server/game/Server/Packets/NPCPackets.h index d5c1b9da118..98fa079afaa 100644 --- a/src/server/game/Server/Packets/NPCPackets.h +++ b/src/server/game/Server/Packets/NPCPackets.h @@ -245,7 +245,7 @@ namespace WorldPackets { public: RequestStabledPets(WorldPacket&& packet) : ClientPacket(CMSG_REQUEST_STABLED_PETS, std::move(packet)) { } - + void Read() override; ObjectGuid StableMaster; diff --git a/src/server/game/Server/Packets/PartyPackets.h b/src/server/game/Server/Packets/PartyPackets.h index 1c31ba25879..388be459eb5 100644 --- a/src/server/game/Server/Packets/PartyPackets.h +++ b/src/server/game/Server/Packets/PartyPackets.h @@ -366,7 +366,7 @@ namespace WorldPackets { public: SetPartyAssignment(WorldPacket&& packet) : ClientPacket(CMSG_SET_PARTY_ASSIGNMENT, std::move(packet)) { } - + void Read() override; uint8 Assignment = 0; uint8 PartyIndex = 0; diff --git a/src/server/game/Server/Packets/PetPackets.cpp b/src/server/game/Server/Packets/PetPackets.cpp index cc58360caff..b07a74dfb10 100644 --- a/src/server/game/Server/Packets/PetPackets.cpp +++ b/src/server/game/Server/Packets/PetPackets.cpp @@ -143,10 +143,10 @@ void WorldPackets::Pet::PetRename::Read() void WorldPackets::Pet::PetAction::Read() { _worldPacket >> PetGUID; - + _worldPacket >> Action; _worldPacket >> TargetGUID; - + _worldPacket >> ActionPosition; } diff --git a/src/server/game/Server/Packets/PetPackets.h b/src/server/game/Server/Packets/PetPackets.h index b857e80f3cb..500fef3a249 100644 --- a/src/server/game/Server/Packets/PetPackets.h +++ b/src/server/game/Server/Packets/PetPackets.h @@ -92,7 +92,7 @@ namespace WorldPackets int32 RecoveryTime = 0; int8 ConsumedCharges = 0; }; - + class PetSpells final : public ServerPacket { public: @@ -157,7 +157,7 @@ namespace WorldPackets std::vector<uint32> Spells; }; - + struct PetRenameData { ObjectGuid PetGUID; diff --git a/src/server/game/Server/Packets/TicketPackets.h b/src/server/game/Server/Packets/TicketPackets.h index 691a7b27bb8..bbab2ecec96 100644 --- a/src/server/game/Server/Packets/TicketPackets.h +++ b/src/server/game/Server/Packets/TicketPackets.h @@ -211,7 +211,7 @@ namespace WorldPackets }; Complaint(WorldPacket&& packet) : ClientPacket(CMSG_COMPLAINT, std::move(packet)) { } - + void Read() override; uint8 ComplaintType = 0; diff --git a/src/server/game/Server/Packets/VoicePackets.h b/src/server/game/Server/Packets/VoicePackets.h index 0ae2645c498..995d1455cc7 100644 --- a/src/server/game/Server/Packets/VoicePackets.h +++ b/src/server/game/Server/Packets/VoicePackets.h @@ -28,7 +28,7 @@ namespace WorldPackets { public: VoiceSessionEnable(WorldPacket&& packet) : ClientPacket(CMSG_VOICE_SESSION_ENABLE, std::move(packet)) { } - + void Read() override; bool EnableVoiceChat = false; @@ -39,7 +39,7 @@ namespace WorldPackets { public: SetActiveVoiceChannel(WorldPacket&& packet) : ClientPacket(CMSG_SET_ACTIVE_VOICE_CHANNEL, std::move(packet)) { } - + void Read() override; uint8 ChannelType = 0; diff --git a/src/server/game/Server/Packets/WardenPackets.h b/src/server/game/Server/Packets/WardenPackets.h index a23046235ff..96581cb3c9b 100644 --- a/src/server/game/Server/Packets/WardenPackets.h +++ b/src/server/game/Server/Packets/WardenPackets.h @@ -28,7 +28,7 @@ namespace WorldPackets { public: WardenData(WorldPacket&& packet) : ClientPacket(CMSG_WARDEN_DATA, std::move(packet)) { } - + void Read() override; ByteBuffer Data; diff --git a/src/server/game/Skills/SkillExtraItems.cpp b/src/server/game/Skills/SkillExtraItems.cpp index 92e0299eafc..f76e4623137 100644 --- a/src/server/game/Skills/SkillExtraItems.cpp +++ b/src/server/game/Skills/SkillExtraItems.cpp @@ -210,7 +210,7 @@ bool CanCreatePerfectItem(Player* player, uint32 spellId, float &perfectCreateCh // lack of entry means no perfection proc possible if (!thisEntry) return false; - + // if you don't have the spell needed, then no procs for you if (!player->HasSpell(thisEntry->requiredSpecialization)) return false; @@ -218,7 +218,7 @@ bool CanCreatePerfectItem(Player* player, uint32 spellId, float &perfectCreateCh // set values as appropriate perfectCreateChance = thisEntry->perfectCreateChance; perfectItemType = thisEntry->perfectItemType; - + // and tell the caller to start rolling the dice return true; } diff --git a/src/server/scripts/Commands/cs_cheat.cpp b/src/server/scripts/Commands/cs_cheat.cpp index ede1039631d..6e01d6404b3 100644 --- a/src/server/scripts/Commands/cs_cheat.cpp +++ b/src/server/scripts/Commands/cs_cheat.cpp @@ -217,10 +217,10 @@ public: if (!*args) argstr = (chr->isTaxiCheater()) ? "off" : "on"; - + if (argstr == "off") - + { chr->SetTaxiCheater(false); handler->PSendSysMessage(LANG_YOU_REMOVE_TAXIS, handler->GetNameLink(chr).c_str()); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp index 194881cabad..1b485f588ec 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp @@ -160,7 +160,7 @@ public: Talk(SAY_AGGRO); summons.DoZoneInCombat(); - + events.SetPhase(PHASE_NORMAL); events.ScheduleEvent(EVENT_IMPALE, randtime(Seconds(10), Seconds(20)), 0, PHASE_NORMAL); events.ScheduleEvent(EVENT_SCARABS, randtime(Seconds(20), Seconds(30)), 0, PHASE_NORMAL); @@ -207,7 +207,7 @@ public: Talk(EMOTE_LOCUST); events.SetPhase(PHASE_SWARM); DoCast(me, SPELL_LOCUST_SWARM); - + events.ScheduleEvent(EVENT_SPAWN_GUARD, Seconds(3)); events.ScheduleEvent(EVENT_LOCUST_ENDS, RAID_MODE(Seconds(19), Seconds(23))); events.Repeat(Minutes(1)+Seconds(30)); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp index 38502bd8a83..3ba0a033a9c 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp @@ -178,7 +178,7 @@ public: return; if (damage < me->GetHealth()) return; - + me->SetHealth(1u); damage = 0u; } @@ -226,7 +226,7 @@ public: case EVENT_WARRIOR: Talk(SAY_SUMMON); Talk(EMOTE_SUMMON); - + CastSummon(RAID_MODE(2, 3), 0, 0); events.Repeat(Seconds(40)); @@ -291,7 +291,7 @@ public: break; case EVENT_GROUND: ++balconyCount; - + DoCastAOE(SPELL_TELEPORT_BACK); Talk(EMOTE_TELEPORT_2); @@ -308,7 +308,7 @@ public: { /* workaround for movechase breaking after blinking without this noth would just stand there unless his current target moves */ - if (justBlinked && me->GetVictim() && !me->IsWithinMeleeRange(me->EnsureVictim())) + if (justBlinked && me->GetVictim() && !me->IsWithinMeleeRange(me->EnsureVictim())) { me->GetMotionMaster()->Clear(); me->GetMotionMaster()->MoveChase(me->EnsureVictim()); @@ -321,7 +321,7 @@ public: private: uint32 balconyCount; - + bool justBlinked; uint32 _SummonWarriorSpells[N_WARRIOR_SPELLS]; diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index fceeb108ebf..67f9f180786 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -298,7 +298,7 @@ const float CAPERNIAN_DISTANCE = 20.0f; //she casts away fro Position const afGravityPos = {795.0f, 0.0f, 70.0f}; -Position const TransitionPos[6] = +Position const TransitionPos[6] = { // First two values are not static, they seem to differ on each sniff. { 794.0522f, -0.96732f, 48.97848f, 0.0f }, @@ -1475,7 +1475,7 @@ class spell_kael_gravity_lapse : public SpellScriptLoader { OnEffectHitTarget += SpellEffectFn(spell_kael_gravity_lapse_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } - + private: uint8 _targetCount; }; diff --git a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp index bc771857818..66848c18930 100644 --- a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp +++ b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp @@ -483,7 +483,7 @@ class npc_barada : public CreatureScript { public: npc_barada() : CreatureScript("npc_barada") { } - + struct npc_baradaAI : public ScriptedAI { npc_baradaAI(Creature* creature) : ScriptedAI(creature) @@ -780,7 +780,7 @@ public: me->SetCanFly(true); me->SetSpeedRate(MOVE_RUN, 0.2f); - + me->SetFacingTo(3.207566f); me->GetMotionMaster()->MoveJump(exorcismPos[2], 2.0f, 2.0f); @@ -861,14 +861,14 @@ public: } } } - + private: EventMap events; SummonList summons; - + uint8 circleRounds; uint8 point; - + bool wpreached; }; |