aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAokromes <Aokromes@users.noreply.github.com>2019-06-26 08:56:20 +0200
committerGiacomo Pozzoni <giacomopoz@gmail.com>2019-06-26 08:56:20 +0200
commitfe744977c917957e112704ccd66e228b826b3f7a (patch)
treece318fb780b0be34356953137c311631dc87de06
parent63383da36e27657734cba6ad23c1bd3d68039d90 (diff)
Coding standards (#23514)
* Coding standards * revert part
-rw-r--r--src/server/game/AuctionHouse/AuctionHouseMgr.h4
-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.cpp6
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp6
-rw-r--r--src/server/game/Grids/GridStates.cpp2
-rw-r--r--src/server/game/Handlers/LFGHandler.cpp4
-rw-r--r--src/server/game/Scripting/ScriptMgr.cpp2
-rw-r--r--src/server/game/Spells/SpellInfo.cpp4
-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
13 files changed, 94 insertions, 94 deletions
diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.h b/src/server/game/AuctionHouse/AuctionHouseMgr.h
index 1eec3ab5869..2138cbc9bae 100644
--- a/src/server/game/AuctionHouse/AuctionHouseMgr.h
+++ b/src/server/game/AuctionHouse/AuctionHouseMgr.h
@@ -107,7 +107,7 @@ struct TC_GAME_API AuctionEntry
//this class is used as auctionhouse instance
class TC_GAME_API AuctionHouseObject
{
- public:
+public:
~AuctionHouseObject()
{
for (AuctionEntryMap::iterator itr = AuctionsMap.begin(); itr != AuctionsMap.end(); ++itr)
@@ -141,7 +141,7 @@ class TC_GAME_API AuctionHouseObject
uint32 inventoryType, uint32 itemClass, uint32 itemSubClass, uint32 quality,
uint32& count, uint32& totalcount, bool getall = false);
- private:
+private:
AuctionEntryMap AuctionsMap;
// Map of throttled players for GetAll, and throttle expiry time
diff --git a/src/server/game/Battlegrounds/BattlegroundQueue.cpp b/src/server/game/Battlegrounds/BattlegroundQueue.cpp
index 4a38c17687b..384dd53e5a6 100644
--- a/src/server/game/Battlegrounds/BattlegroundQueue.cpp
+++ b/src/server/game/Battlegrounds/BattlegroundQueue.cpp
@@ -131,7 +131,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, BattlegroundTypeId BgTypeId, PvPDifficultyEntry const* bracketEntry, uint8 ArenaType, bool isRated, bool isPremade, uint32 ArenaRating, uint32 MatchmakerRating, uint32 arenateamid)
+GroupQueueInfo* BattlegroundQueue::AddGroup(Player* leader, Group* grp, BattlegroundTypeId BgTypeId, PvPDifficultyEntry const* bracketEntry, uint8 ArenaType, bool isRated, 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 ef13942aee4..7a266442493 100644
--- a/src/server/game/Entities/Item/Item.cpp
+++ b/src/server/game/Entities/Item/Item.cpp
@@ -739,7 +739,7 @@ bool Item::HasEnchantRequiredSkill(Player const* player) const
if (enchantEntry->requiredSkill && player->GetSkillValue(enchantEntry->requiredSkill) < enchantEntry->requiredSkillValue)
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 3820e3e8523..8330c861140 100644
--- a/src/server/game/Entities/Object/Object.cpp
+++ b/src/server/game/Entities/Object/Object.cpp
@@ -771,14 +771,14 @@ void Object::ApplyModInt32Value(uint16 index, int32 val, bool apply)
SetInt32Value(index, cur);
}
-void Object::ApplyModSignedFloatValue(uint16 index, float val, bool apply)
+void Object::ApplyModSignedFloatValue(uint16 index, float val, bool apply)
{
float cur = GetFloatValue(index);
cur += (apply ? val : -val);
SetFloatValue(index, cur);
}
-void Object::ApplyModPositiveFloatValue(uint16 index, float val, bool apply)
+void Object::ApplyModPositiveFloatValue(uint16 index, float val, bool apply)
{
float cur = GetFloatValue(index);
cur += (apply ? val : -val);
@@ -1368,7 +1368,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 9f288407813..09d04fb646e 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -4377,7 +4377,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
{
// we should not be able to dispel diseases if the target is affected by unholy blight
if (dispelMask & (1 << DISPEL_DISEASE) && HasAura(50536))
@@ -8028,7 +8028,7 @@ void Unit::Mount(uint32 mount, uint32 VehicleId, uint32 creatureEntry)
if (CreateVehicleKit(VehicleId, creatureEntry))
{
// Send others that we now have a vehicle
- WorldPacket data(SMSG_PLAYER_VEHICLE_DATA, GetPackGUID().size()+4);
+ WorldPacket data(SMSG_PLAYER_VEHICLE_DATA, GetPackGUID().size() + 4);
data << GetPackGUID();
data << uint32(VehicleId);
SendMessageToSet(&data, true);
@@ -8093,7 +8093,7 @@ void Unit::Dismount()
if (GetTypeId() == TYPEID_PLAYER && GetVehicleKit())
{
// Send other players that we are no longer a vehicle
- data.Initialize(SMSG_PLAYER_VEHICLE_DATA, 8+4);
+ data.Initialize(SMSG_PLAYER_VEHICLE_DATA, 8 + 4);
data << GetPackGUID();
data << uint32(0);
ToPlayer()->SendMessageToSet(&data, true);
diff --git a/src/server/game/Grids/GridStates.cpp b/src/server/game/Grids/GridStates.cpp
index ad81ab44263..5edc9803b52 100644
--- a/src/server/game/Grids/GridStates.cpp
+++ b/src/server/game/Grids/GridStates.cpp
@@ -26,7 +26,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/Handlers/LFGHandler.cpp b/src/server/game/Handlers/LFGHandler.cpp
index 76ac7ccf3ca..b46e44d7b34 100644
--- a/src/server/game/Handlers/LFGHandler.cpp
+++ b/src/server/game/Handlers/LFGHandler.cpp
@@ -133,7 +133,7 @@ void WorldSession::HandleLfgSetRolesOpcode(WorldPacket& recvData)
sLFGMgr->UpdateRoleCheck(gguid, guid, roles);
}
-void WorldSession::HandleLfgSetCommentOpcode(WorldPacket& recvData)
+void WorldSession::HandleLfgSetCommentOpcode(WorldPacket& recvData)
{
std::string comment;
recvData >> comment;
@@ -236,7 +236,7 @@ void WorldSession::HandleLfgPlayerLockInfoRequestOpcode(WorldPacket& /*recvData*
SendPacket(&data);
}
-void WorldSession::HandleLfgPartyLockInfoRequestOpcode(WorldPacket& /*recvData*/)
+void WorldSession::HandleLfgPartyLockInfoRequestOpcode(WorldPacket& /*recvData*/)
{
ObjectGuid guid = GetPlayer()->GetGUID();
TC_LOG_DEBUG("lfg", "CMSG_LFG_PARTY_LOCK_INFO_REQUEST %s", GetPlayerInfo().c_str());
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp
index e29d0126586..0693f96609a 100644
--- a/src/server/game/Scripting/ScriptMgr.cpp
+++ b/src/server/game/Scripting/ScriptMgr.cpp
@@ -1001,7 +1001,7 @@ ScriptObject::~ScriptObject()
}
ScriptMgr::ScriptMgr()
- : _scriptCount(0), _script_loader_callback(nullptr)
+ : _scriptCount(0), _script_loader_callback(nullptr)
{
}
diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp
index 544803b97b5..910fbcfc557 100644
--- a/src/server/game/Spells/SpellInfo.cpp
+++ b/src/server/game/Spells/SpellInfo.cpp
@@ -211,7 +211,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
@@ -595,7 +595,7 @@ SpellTargetObjectTypes SpellEffectInfo::GetUsedTargetObjectType() const
return _data[Effect].UsedTargetObjectType;
}
-SpellEffectInfo::StaticData SpellEffectInfo::_data[TOTAL_SPELL_EFFECTS] =
+SpellEffectInfo::StaticData SpellEffectInfo::_data[TOTAL_SPELL_EFFECTS] =
{
// implicit target type used target object type
{EFFECT_IMPLICIT_TARGET_NONE, TARGET_OBJECT_TYPE_NONE}, // 0
diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h
index 7b162b121e7..2a361d2a0cf 100644
--- a/src/server/game/Spells/SpellMgr.h
+++ b/src/server/game/Spells/SpellMgr.h
@@ -496,8 +496,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 1085343a14c..285f0a1cabe 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 8d0ad23e7d4..5d16f56b83f 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 872c2489b5a..3fc2d5b1f90 100644
--- a/src/server/scripts/Outland/zone_nagrand.cpp
+++ b/src/server/scripts/Outland/zone_nagrand.cpp
@@ -223,23 +223,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
@@ -296,63 +296,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);
+ }
+ };
+ };
};
/*#####