aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Battlegrounds/BattlegroundQueue.cpp2
-rw-r--r--src/server/game/Entities/Item/Item.cpp2
-rw-r--r--src/server/game/Entities/Object/Object.cpp2
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp2
-rw-r--r--src/server/game/Grids/GridStates.cpp2
-rw-r--r--src/server/game/Scripting/ScriptMgr.cpp2
-rw-r--r--src/server/game/Spells/SpellInfo.cpp2
-rw-r--r--src/server/game/Spells/SpellMgr.h4
-rw-r--r--src/server/scripts/Commands/cs_gm.cpp2
-rw-r--r--src/server/scripts/Outland/BlackTemple/boss_illidan.cpp2
-rw-r--r--src/server/scripts/Outland/zone_nagrand.cpp148
11 files changed, 85 insertions, 85 deletions
diff --git a/src/server/game/Battlegrounds/BattlegroundQueue.cpp b/src/server/game/Battlegrounds/BattlegroundQueue.cpp
index f25f78e2a36..0b8ae1afad9 100644
--- a/src/server/game/Battlegrounds/BattlegroundQueue.cpp
+++ b/src/server/game/Battlegrounds/BattlegroundQueue.cpp
@@ -130,7 +130,7 @@ bool BattlegroundQueue::SelectionPool::AddGroup(GroupQueueInfo* ginfo, uint32 de
/*********************************************************/
// add group or player (grp == NULL) to bg queue with the given leader and bg specifications
-GroupQueueInfo* BattlegroundQueue::AddGroup(Player* leader, Group* grp, PVPDifficultyEntry const* bracketEntry, bool isPremade, uint32 ArenaRating, uint32 MatchmakerRating, uint32 arenateamid)
+GroupQueueInfo* BattlegroundQueue::AddGroup(Player* leader, Group* grp, PVPDifficultyEntry const* bracketEntry, bool isPremade, uint32 ArenaRating, uint32 MatchmakerRating, uint32 arenateamid)
{
BattlegroundBracketId bracketId = bracketEntry->GetBracketId();
diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp
index 2fe2f2247b9..7c2e0a817c8 100644
--- a/src/server/game/Entities/Item/Item.cpp
+++ b/src/server/game/Entities/Item/Item.cpp
@@ -1264,7 +1264,7 @@ bool Item::HasEnchantRequiredSkill(Player const* player) const
return false;
}
- return true;
+ return true;
}
uint32 Item::GetEnchantRequiredLevel() const
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp
index 4e1ea49930a..cdcfe9b2ae4 100644
--- a/src/server/game/Entities/Object/Object.cpp
+++ b/src/server/game/Entities/Object/Object.cpp
@@ -1209,7 +1209,7 @@ bool WorldObject::IsInBetween(Position const& pos1, Position const& pos2, float
return (size * size) >= GetExactDist2dSq(pos1.GetPositionX() + std::cos(angle) * dist, pos1.GetPositionY() + std::sin(angle) * dist);
}
-bool WorldObject::isInFront(WorldObject const* target, float arc) const
+bool WorldObject::isInFront(WorldObject const* target, float arc) const
{
return HasInArc(arc, target);
}
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index a01de0e7ba6..9ac55835372 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -4305,7 +4305,7 @@ Aura* Unit::GetAuraOfRankedSpell(uint32 spellId, ObjectGuid casterGUID, ObjectGu
return aurApp ? aurApp->GetBase() : nullptr;
}
-void Unit::GetDispellableAuraList(WorldObject const* caster, uint32 dispelMask, DispelChargesList& dispelList, bool isReflect /*= false*/) const
+void Unit::GetDispellableAuraList(WorldObject const* caster, uint32 dispelMask, DispelChargesList& dispelList, bool isReflect /*= false*/) const
{
AuraMap const& auras = GetOwnedAuras();
for (auto itr = auras.begin(); itr != auras.end(); ++itr)
diff --git a/src/server/game/Grids/GridStates.cpp b/src/server/game/Grids/GridStates.cpp
index 1d77032a04f..d819a36a620 100644
--- a/src/server/game/Grids/GridStates.cpp
+++ b/src/server/game/Grids/GridStates.cpp
@@ -25,7 +25,7 @@ void InvalidState::Update(Map&, NGridType&, GridInfo&, uint32) const
{
}
-void ActiveState::Update(Map& map, NGridType& grid, GridInfo& info, uint32 diff) const
+void ActiveState::Update(Map& map, NGridType& grid, GridInfo& info, uint32 diff) const
{
// Only check grid activity every (grid_expiry/10) ms, because it's really useless to do it every cycle
info.UpdateTimeTracker(diff);
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp
index 917298fddd5..fd71385152d 100644
--- a/src/server/game/Scripting/ScriptMgr.cpp
+++ b/src/server/game/Scripting/ScriptMgr.cpp
@@ -1177,7 +1177,7 @@ ScriptObject::~ScriptObject()
}
ScriptMgr::ScriptMgr()
- : _scriptCount(0), _scriptIdUpdated(false), _script_loader_callback(nullptr)
+ : _scriptCount(0), _scriptIdUpdated(false), _script_loader_callback(nullptr)
{
}
diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp
index e80de7b966f..d18e56e703f 100644
--- a/src/server/game/Spells/SpellInfo.cpp
+++ b/src/server/game/Spells/SpellInfo.cpp
@@ -216,7 +216,7 @@ uint32 SpellImplicitTargetInfo::GetExplicitTargetMask(bool& srcSet, bool& dstSet
return targetMask;
}
-SpellImplicitTargetInfo::StaticData SpellImplicitTargetInfo::_data[TOTAL_SPELL_TARGETS] =
+SpellImplicitTargetInfo::StaticData SpellImplicitTargetInfo::_data[TOTAL_SPELL_TARGETS] =
{
{TARGET_OBJECT_TYPE_NONE, TARGET_REFERENCE_TYPE_NONE, TARGET_SELECT_CATEGORY_NYI, TARGET_CHECK_DEFAULT, TARGET_DIR_NONE}, //
{TARGET_OBJECT_TYPE_UNIT, TARGET_REFERENCE_TYPE_CASTER, TARGET_SELECT_CATEGORY_DEFAULT, TARGET_CHECK_DEFAULT, TARGET_DIR_NONE}, // 1 TARGET_UNIT_CASTER
diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h
index 840648ecdfe..0106cc796fd 100644
--- a/src/server/game/Spells/SpellMgr.h
+++ b/src/server/game/Spells/SpellMgr.h
@@ -513,8 +513,8 @@ typedef std::multimap<uint32, SpellArea const*> SpellAreaForAreaMap;
typedef std::multimap<std::pair<uint32, uint32>, SpellArea const*> SpellAreaForQuestAreaMap;
typedef std::pair<SpellAreaMap::const_iterator, SpellAreaMap::const_iterator> SpellAreaMapBounds;
typedef std::pair<SpellAreaForQuestMap::const_iterator, SpellAreaForQuestMap::const_iterator> SpellAreaForQuestMapBounds;
-typedef std::pair<SpellAreaForAuraMap::const_iterator, SpellAreaForAuraMap::const_iterator> SpellAreaForAuraMapBounds;
-typedef std::pair<SpellAreaForAreaMap::const_iterator, SpellAreaForAreaMap::const_iterator> SpellAreaForAreaMapBounds;
+typedef std::pair<SpellAreaForAuraMap::const_iterator, SpellAreaForAuraMap::const_iterator> SpellAreaForAuraMapBounds;
+typedef std::pair<SpellAreaForAreaMap::const_iterator, SpellAreaForAreaMap::const_iterator> SpellAreaForAreaMapBounds;
typedef std::pair<SpellAreaForQuestAreaMap::const_iterator, SpellAreaForQuestAreaMap::const_iterator> SpellAreaForQuestAreaMapBounds;
// Spell rank chain (accessed using SpellMgr functions)
diff --git a/src/server/scripts/Commands/cs_gm.cpp b/src/server/scripts/Commands/cs_gm.cpp
index 9c076691a18..991105ed32d 100644
--- a/src/server/scripts/Commands/cs_gm.cpp
+++ b/src/server/scripts/Commands/cs_gm.cpp
@@ -100,7 +100,7 @@ public:
if (!*args)
return false;
- Player* target = handler->getSelectedPlayer();
+ Player* target = handler->getSelectedPlayer();
if (!target)
target = handler->GetSession()->GetPlayer();
diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
index 640fe275c61..98ca41b064e 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
@@ -2320,7 +2320,7 @@ class spell_maiev_down : public AuraScript
}
};
-// 40693 - Cage Trap
+// 40693 - Cage Trap
class spell_illidan_cage_teleport : public SpellScript
{
PrepareSpellScript(spell_illidan_cage_teleport);
diff --git a/src/server/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp
index 159cfaede33..4b166ba9586 100644
--- a/src/server/scripts/Outland/zone_nagrand.cpp
+++ b/src/server/scripts/Outland/zone_nagrand.cpp
@@ -222,23 +222,23 @@ public:
enum CorkiData
{
- // first quest
- QUEST_HELP = 9923,
- NPC_CORKI = 18445,
- NPC_CORKI_CREDIT_1 = 18369,
- GO_CORKIS_PRISON = 182349,
- CORKI_SAY_THANKS = 0,
- // 2nd quest
- QUEST_CORKIS_GONE_MISSING_AGAIN = 9924,
- NPC_CORKI_2 = 20812,
- GO_CORKIS_PRISON_2 = 182350,
- CORKI_SAY_PROMISE = 0,
- // 3rd quest
- QUEST_CHOWAR_THE_PILLAGER = 9955,
- NPC_CORKI_3 = 18369,
- NPC_CORKI_CREDIT_3 = 18444,
- GO_CORKIS_PRISON_3 = 182521,
- CORKI_SAY_LAST = 0
+ // first quest
+ QUEST_HELP = 9923,
+ NPC_CORKI = 18445,
+ NPC_CORKI_CREDIT_1 = 18369,
+ GO_CORKIS_PRISON = 182349,
+ CORKI_SAY_THANKS = 0,
+ // 2nd quest
+ QUEST_CORKIS_GONE_MISSING_AGAIN = 9924,
+ NPC_CORKI_2 = 20812,
+ GO_CORKIS_PRISON_2 = 182350,
+ CORKI_SAY_PROMISE = 0,
+ // 3rd quest
+ QUEST_CHOWAR_THE_PILLAGER = 9955,
+ NPC_CORKI_3 = 18369,
+ NPC_CORKI_CREDIT_3 = 18444,
+ GO_CORKIS_PRISON_3 = 182521,
+ CORKI_SAY_LAST = 0
};
class go_corkis_prison : public GameObjectScript
@@ -295,63 +295,63 @@ public:
class npc_corki : public CreatureScript
{
public:
- npc_corki() : CreatureScript("npc_corki") { }
-
- CreatureAI* GetAI(Creature* creature) const override
- {
- return new npc_corkiAI(creature);
- }
-
- struct npc_corkiAI : public ScriptedAI
- {
- npc_corkiAI(Creature* creature) : ScriptedAI(creature)
- {
- Initialize();
- }
-
- void Initialize()
- {
- Say_Timer = 5000;
- ReleasedFromCage = false;
- }
-
- uint32 Say_Timer;
- bool ReleasedFromCage;
-
- void Reset() override
- {
- Initialize();
- }
-
- void UpdateAI(uint32 diff) override
- {
- if (ReleasedFromCage)
- {
- if (Say_Timer <= diff)
- {
- me->DespawnOrUnsummon();
- ReleasedFromCage = false;
- }
- else
- Say_Timer -= diff;
- }
- }
-
- void MovementInform(uint32 type, uint32 id) override
- {
- if (type == POINT_MOTION_TYPE && id == 1)
- {
- Say_Timer = 5000;
- ReleasedFromCage = true;
- if (me->GetEntry() == NPC_CORKI)
- Talk(CORKI_SAY_THANKS);
- if (me->GetEntry() == NPC_CORKI_2)
- Talk(CORKI_SAY_PROMISE);
- if (me->GetEntry() == NPC_CORKI_3)
- Talk(CORKI_SAY_LAST);
- }
- };
- };
+ npc_corki() : CreatureScript("npc_corki") { }
+
+ CreatureAI* GetAI(Creature* creature) const override
+ {
+ return new npc_corkiAI(creature);
+ }
+
+ struct npc_corkiAI : public ScriptedAI
+ {
+ npc_corkiAI(Creature* creature) : ScriptedAI(creature)
+ {
+ Initialize();
+ }
+
+ void Initialize()
+ {
+ Say_Timer = 5000;
+ ReleasedFromCage = false;
+ }
+
+ uint32 Say_Timer;
+ bool ReleasedFromCage;
+
+ void Reset() override
+ {
+ Initialize();
+ }
+
+ void UpdateAI(uint32 diff) override
+ {
+ if (ReleasedFromCage)
+ {
+ if (Say_Timer <= diff)
+ {
+ me->DespawnOrUnsummon();
+ ReleasedFromCage = false;
+ }
+ else
+ Say_Timer -= diff;
+ }
+ }
+
+ void MovementInform(uint32 type, uint32 id) override
+ {
+ if (type == POINT_MOTION_TYPE && id == 1)
+ {
+ Say_Timer = 5000;
+ ReleasedFromCage = true;
+ if (me->GetEntry() == NPC_CORKI)
+ Talk(CORKI_SAY_THANKS);
+ if (me->GetEntry() == NPC_CORKI_2)
+ Talk(CORKI_SAY_PROMISE);
+ if (me->GetEntry() == NPC_CORKI_3)
+ Talk(CORKI_SAY_LAST);
+ }
+ };
+ };
};
/*#####