aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAokromes <Aokromes@users.noreply.github.com>2019-07-08 12:51:42 +0200
committerShauren <shauren.trinity@gmail.com>2021-12-14 23:04:29 +0100
commit3ad5bc1e15574e1534fe60e06772d4b293cdf13c (patch)
tree578571e2f9cd64dfff6cab45662856e8de90a05d
parent2532de6acb7d73957a8fca44e7fc26160f47cc47 (diff)
Core/Misc: More coding standards (#23519)
* Core/Misc: More coding standards * revert part * "void " or more to "void " * fix? reject * remove more double whitespaces * remove more double whitespaces * more standards * more coding standards * More standards * more coding * more coding standards * more coding standards * And more standards (cherry picked from commit 574a7c8d3d5f5a5660295deb70e905cf4dd756c4)
Diffstat
-rw-r--r--src/server/game/AuctionHouseBot/AuctionHouseBotBuyer.h18
-rw-r--r--src/server/game/Battlefield/Battlefield.cpp2
-rw-r--r--src/server/game/Battlegrounds/ArenaTeam.h32
-rw-r--r--src/server/game/Battlegrounds/Battleground.h8
-rw-r--r--src/server/game/Battlegrounds/BattlegroundQueue.h4
-rw-r--r--src/server/game/Battlegrounds/Zones/BattlegroundAV.h2
-rw-r--r--src/server/game/Chat/Chat.h16
-rw-r--r--src/server/game/DungeonFinding/LFGMgr.h2
-rw-r--r--src/server/game/Entities/Item/Item.h2
-rw-r--r--src/server/game/Entities/Object/Object.cpp8
-rw-r--r--src/server/game/Entities/Object/Object.h20
-rw-r--r--src/server/game/Entities/Player/Player.h2
-rw-r--r--src/server/game/Entities/Unit/Unit.h16
-rw-r--r--src/server/game/Globals/ObjectMgr.cpp6
-rw-r--r--src/server/game/Grids/Notifiers/GridNotifiers.h4
-rw-r--r--src/server/game/Groups/Group.h40
-rw-r--r--src/server/game/Guilds/Guild.h4
-rw-r--r--src/server/game/Loot/LootMgr.h18
-rw-r--r--src/server/game/Movement/MovementGenerators/FlightPathMovementGenerator.cpp2
-rw-r--r--src/server/game/Movement/PathGenerator.h2
-rw-r--r--src/server/game/OutdoorPvP/OutdoorPvPMgr.h4
-rw-r--r--src/server/game/Pools/PoolMgr.cpp4
-rw-r--r--src/server/game/Pools/PoolMgr.h6
-rw-r--r--src/server/game/Quests/QuestDef.h86
-rw-r--r--src/server/game/Server/WorldSession.cpp2
-rw-r--r--src/server/game/Spells/Spell.h2
-rw-r--r--src/server/game/World/World.h4
27 files changed, 158 insertions, 158 deletions
diff --git a/src/server/game/AuctionHouseBot/AuctionHouseBotBuyer.h b/src/server/game/AuctionHouseBot/AuctionHouseBotBuyer.h
index 10087e4b624..70d78c713cb 100644
--- a/src/server/game/AuctionHouseBot/AuctionHouseBotBuyer.h
+++ b/src/server/game/AuctionHouseBot/AuctionHouseBotBuyer.h
@@ -26,21 +26,21 @@ struct BuyerAuctionEval
{
BuyerAuctionEval() : AuctionId(0), LastChecked(0), LastExist(0) { }
- uint32 AuctionId;
- time_t LastChecked;
- time_t LastExist;
+ uint32 AuctionId;
+ time_t LastChecked;
+ time_t LastExist;
};
struct BuyerItemInfo
{
BuyerItemInfo() : BidItemCount(0), BuyItemCount(0), MinBuyPrice(0), MinBidPrice(0), TotalBuyPrice(0), TotalBidPrice(0) { }
- uint32 BidItemCount;
- uint32 BuyItemCount;
- uint32 MinBuyPrice;
- uint32 MinBidPrice;
- double TotalBuyPrice;
- double TotalBidPrice;
+ uint32 BidItemCount;
+ uint32 BuyItemCount;
+ uint32 MinBuyPrice;
+ uint32 MinBidPrice;
+ double TotalBuyPrice;
+ double TotalBidPrice;
};
typedef std::map<uint32, BuyerItemInfo> BuyerItemInfoMap;
diff --git a/src/server/game/Battlefield/Battlefield.cpp b/src/server/game/Battlefield/Battlefield.cpp
index f300f32d93a..7de04ff4502 100644
--- a/src/server/game/Battlefield/Battlefield.cpp
+++ b/src/server/game/Battlefield/Battlefield.cpp
@@ -718,7 +718,7 @@ void BfGraveyard::Resurrect()
if (!player)
continue;
- // Check if the player is in world and on the good graveyard
+ // Check if the player is in world and on the good graveyard
if (player->IsInWorld())
if (Creature* spirit = m_Bf->GetCreature(m_SpiritGuide[m_ControlTeam]))
spirit->CastSpell(spirit, SPELL_SPIRIT_HEAL, true);
diff --git a/src/server/game/Battlegrounds/ArenaTeam.h b/src/server/game/Battlegrounds/ArenaTeam.h
index 0c40635150e..fcd8b266cd4 100644
--- a/src/server/game/Battlegrounds/ArenaTeam.h
+++ b/src/server/game/Battlegrounds/ArenaTeam.h
@@ -122,7 +122,7 @@ class TC_GAME_API ArenaTeam
uint32 GetId() const { return TeamId; }
uint32 GetType() const { return Type; }
- uint8 GetSlot() const { return GetSlotByType(GetType()); }
+ uint8 GetSlot() const { return GetSlotByType(GetType()); }
static uint8 GetSlotByType(uint32 type);
static uint8 GetTypeBySlot(uint8 slot);
ObjectGuid GetCaptain() const { return CaptainGuid; }
@@ -137,10 +137,10 @@ class TC_GAME_API ArenaTeam
bool AddMember(ObjectGuid PlayerGuid);
void DelMember(ObjectGuid guid, bool cleanDb);
- size_t GetMembersSize() const { return Members.size(); }
- bool Empty() const { return Members.empty(); }
+ size_t GetMembersSize() const { return Members.size(); }
+ bool Empty() const { return Members.empty(); }
MemberList::iterator m_membersBegin() { return Members.begin(); }
- MemberList::iterator m_membersEnd() { return Members.end(); }
+ MemberList::iterator m_membersEnd() { return Members.end(); }
bool IsMember(ObjectGuid guid) const;
ArenaTeamMember* GetMember(ObjectGuid guid);
@@ -160,14 +160,14 @@ class TC_GAME_API ArenaTeam
void Inspect(WorldSession* session, ObjectGuid guid);
uint32 GetPoints(uint32 MemberRating);
- int32 GetMatchmakerRatingMod(uint32 ownRating, uint32 opponentRating, bool won);
- int32 GetRatingMod(uint32 ownRating, uint32 opponentRating, bool won);
- float GetChanceAgainst(uint32 ownRating, uint32 opponentRating);
- int32 WonAgainst(uint32 Own_MMRating, uint32 Opponent_MMRating, int32& rating_change);
- void MemberWon(Player* player, uint32 againstMatchmakerRating, int32 MatchmakerRatingChange);
- int32 LostAgainst(uint32 Own_MMRating, uint32 Opponent_MMRating, int32& rating_change);
- void MemberLost(Player* player, uint32 againstMatchmakerRating, int32 MatchmakerRatingChange = -12);
- void OfflineMemberLost(ObjectGuid guid, uint32 againstMatchmakerRating, int32 MatchmakerRatingChange = -12);
+ int32 GetMatchmakerRatingMod(uint32 ownRating, uint32 opponentRating, bool won);
+ int32 GetRatingMod(uint32 ownRating, uint32 opponentRating, bool won);
+ float GetChanceAgainst(uint32 ownRating, uint32 opponentRating);
+ int32 WonAgainst(uint32 Own_MMRating, uint32 Opponent_MMRating, int32& rating_change);
+ void MemberWon(Player* player, uint32 againstMatchmakerRating, int32 MatchmakerRatingChange);
+ int32 LostAgainst(uint32 Own_MMRating, uint32 Opponent_MMRating, int32& rating_change);
+ void MemberLost(Player* player, uint32 againstMatchmakerRating, int32 MatchmakerRatingChange = -12);
+ void OfflineMemberLost(ObjectGuid guid, uint32 againstMatchmakerRating, int32 MatchmakerRatingChange = -12);
@@ -178,14 +178,14 @@ class TC_GAME_API ArenaTeam
protected:
uint32 TeamId;
- uint8 Type;
+ uint8 Type;
std::string TeamName;
- ObjectGuid CaptainGuid;
+ ObjectGuid CaptainGuid;
uint32 BackgroundColor; // ARGB format
- uint8 EmblemStyle; // icon id
+ uint8 EmblemStyle; // icon id
uint32 EmblemColor; // ARGB format
- uint8 BorderStyle; // border image id
+ uint8 BorderStyle; // border image id
uint32 BorderColor; // ARGB format
MemberList Members;
diff --git a/src/server/game/Battlegrounds/Battleground.h b/src/server/game/Battlegrounds/Battleground.h
index 2e942d5c7a7..67b29872865 100644
--- a/src/server/game/Battlegrounds/Battleground.h
+++ b/src/server/game/Battlegrounds/Battleground.h
@@ -168,9 +168,9 @@ enum BattlegroundStatus
struct BattlegroundPlayer
{
- time_t OfflineRemoveTime; // for tracking and removing offline players from queue after 5 minutes
- uint32 Team; // Player's team
- int32 ActiveSpec; // Player's active spec
+ time_t OfflineRemoveTime; // for tracking and removing offline players from queue after 5 minutes
+ uint32 Team; // Player's team
+ int32 ActiveSpec; // Player's active spec
};
struct BattlegroundObjectInfo
@@ -569,7 +569,7 @@ class TC_GAME_API Battleground
// these are important variables used for starting messages
uint8 m_Events;
- BattlegroundStartTimeIntervals StartDelayTimes[BG_STARTING_EVENT_COUNT];
+ BattlegroundStartTimeIntervals StartDelayTimes[BG_STARTING_EVENT_COUNT];
// this must be filled in constructors!
uint32 StartMessageIds[BG_STARTING_EVENT_COUNT];
diff --git a/src/server/game/Battlegrounds/BattlegroundQueue.h b/src/server/game/Battlegrounds/BattlegroundQueue.h
index 5e4d851924a..80bd7d62275 100644
--- a/src/server/game/Battlegrounds/BattlegroundQueue.h
+++ b/src/server/game/Battlegrounds/BattlegroundQueue.h
@@ -33,8 +33,8 @@ typedef std::list<Battleground*> BGFreeSlotQueueContainer;
struct GroupQueueInfo; // type predefinition
struct PlayerQueueInfo // stores information for players in queue
{
- uint32 LastOnlineTime; // for tracking and removing offline players from queue after 5 minutes
- GroupQueueInfo* GroupInfo; // pointer to the associated groupqueueinfo
+ uint32 LastOnlineTime; // for tracking and removing offline players from queue after 5 minutes
+ GroupQueueInfo* GroupInfo; // pointer to the associated groupqueueinfo
};
struct GroupQueueInfo // stores information about the group in queue (also used when joined as solo!)
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.h b/src/server/game/Battlegrounds/Zones/BattlegroundAV.h
index e2454ec88ff..cbc1bdb30d0 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.h
@@ -88,7 +88,7 @@ enum BG_AV_Sounds
ally wins
8192:
ally tower destroy(only iceblood - found a bug^^)
- ally tower defend
+ ally tower defend
horde tower defend
8213
horde:
diff --git a/src/server/game/Chat/Chat.h b/src/server/game/Chat/Chat.h
index d8db951cb66..3f8bc30522c 100644
--- a/src/server/game/Chat/Chat.h
+++ b/src/server/game/Chat/Chat.h
@@ -93,21 +93,21 @@ class TC_GAME_API ChatHandler
bool HasLowerSecurityAccount(WorldSession* target, uint32 account, bool strong = false);
void SendGlobalGMSysMessage(const char *str);
- Player* getSelectedPlayer();
+ Player* getSelectedPlayer();
Creature* getSelectedCreature();
- Unit* getSelectedUnit();
+ Unit* getSelectedUnit();
WorldObject* getSelectedObject();
// Returns either the selected player or self if there is no selected player
- Player* getSelectedPlayerOrSelf();
+ Player* getSelectedPlayerOrSelf();
- char* extractKeyFromLink(char* text, char const* linkType, char** something1 = nullptr);
- char* extractKeyFromLink(char* text, char const* const* linkTypes, int* found_idx, char** something1 = nullptr);
+ char* extractKeyFromLink(char* text, char const* linkType, char** something1 = nullptr);
+ char* extractKeyFromLink(char* text, char const* const* linkTypes, int* found_idx, char** something1 = nullptr);
// if args have single value then it return in arg2 and arg1 == nullptr
- void extractOptFirstArg(char* args, char** arg1, char** arg2);
- char* extractQuotedArg(char* args);
+ void extractOptFirstArg(char* args, char** arg1, char** arg2);
+ char* extractQuotedArg(char* args);
- uint32 extractSpellIdFromLink(char* text);
+ uint32 extractSpellIdFromLink(char* text);
ObjectGuid::LowType extractLowGuidFromLink(char* text, HighGuid& guidHigh);
GameTele const* extractGameTeleFromLink(char* text);
bool GetPlayerGroupAndGUIDByName(const char* cname, Player*& player, Group*& group, ObjectGuid& guid, bool offline = false);
diff --git a/src/server/game/DungeonFinding/LFGMgr.h b/src/server/game/DungeonFinding/LFGMgr.h
index b7209f5c18c..72160b20f34 100644
--- a/src/server/game/DungeonFinding/LFGMgr.h
+++ b/src/server/game/DungeonFinding/LFGMgr.h
@@ -482,7 +482,7 @@ class TC_GAME_API LFGMgr
LfgCachedDungeonContainer CachedDungeonMapStore; /// Stores all dungeons by groupType
// Reward System
LfgRewardContainer RewardMapStore; /// Stores rewards for random dungeons
- LFGDungeonContainer LfgDungeonStore;
+ LFGDungeonContainer LfgDungeonStore;
// Rolecheck - Proposal - Vote Kicks
LfgRoleCheckContainer RoleChecksStore; /// Current Role checks
LfgProposalContainer ProposalsStore; /// Current Proposals
diff --git a/src/server/game/Entities/Item/Item.h b/src/server/game/Entities/Item/Item.h
index b0f05500b06..5f0e34a0d2d 100644
--- a/src/server/game/Entities/Item/Item.h
+++ b/src/server/game/Entities/Item/Item.h
@@ -303,7 +303,7 @@ class TC_GAME_API Item : public Object
// spell charges (signed but stored as unsigned)
int32 GetSpellCharges(uint8 index/*0..5*/ = 0) const { return m_itemData->SpellCharges[index]; }
- void SetSpellCharges(uint8 index/*0..5*/, int32 value) { SetUpdateFieldValue(m_values.ModifyValue(&Item::m_itemData).ModifyValue(&UF::ItemData::SpellCharges, index), value); }
+ void SetSpellCharges(uint8 index/*0..5*/, int32 value) { SetUpdateFieldValue(m_values.ModifyValue(&Item::m_itemData).ModifyValue(&UF::ItemData::SpellCharges, index), value); }
Loot loot;
bool m_lootGenerated;
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp
index ec118399324..8ad61e05493 100644
--- a/src/server/game/Entities/Object/Object.cpp
+++ b/src/server/game/Entities/Object/Object.cpp
@@ -3023,7 +3023,7 @@ void WorldObject::GetPlayerListInGrid(Container& playerContainer, float maxSearc
Cell::VisitWorldObjects(this, searcher, maxSearchRange);
}
-void WorldObject::GetNearPoint2D(WorldObject const* searcher, float &x, float &y, float distance2d, float absAngle) const
+void WorldObject::GetNearPoint2D(WorldObject const* searcher, float& x, float& y, float distance2d, float absAngle) const
{
float effectiveReach = GetCombatReach();
@@ -3052,7 +3052,7 @@ void WorldObject::GetNearPoint2D(WorldObject const* searcher, float &x, float &y
Trinity::NormalizeMapCoord(y);
}
-void WorldObject::GetNearPoint(WorldObject const* searcher, float &x, float &y, float &z, float distance2d, float absAngle) const
+void WorldObject::GetNearPoint(WorldObject const* searcher, float& x, float& y, float& z, float distance2d, float absAngle) const
{
GetNearPoint2D(searcher, x, y, distance2d, absAngle);
z = GetPositionZ();
@@ -3087,10 +3087,10 @@ void WorldObject::GetNearPoint(WorldObject const* searcher, float &x, float &y,
z = first_z;
}
-void WorldObject::GetClosePoint(float &x, float &y, float &z, float size, float distance2d /*= 0*/, float relAngle /*= 0*/) const
+void WorldObject::GetClosePoint(float& x, float& y, float& z, float size, float distance2d /*= 0*/, float relAngle /*= 0*/) const
{
// angle calculated from current orientation
- GetNearPoint(nullptr, x, y, z, distance2d+size, GetOrientation() + relAngle);
+ GetNearPoint(nullptr, x, y, z, distance2d + size, GetOrientation() + relAngle);
}
Position WorldObject::GetNearPosition(float dist, float angle)
diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h
index 2138d83bc78..579a8d16e93 100644
--- a/src/server/game/Entities/Object/Object.h
+++ b/src/server/game/Entities/Object/Object.h
@@ -419,14 +419,14 @@ class FlaggedValuesArray32
m_flags = 0;
}
- T_FLAGS GetFlags() const { return m_flags; }
- bool HasFlag(FLAG_TYPE flag) const { return m_flags & (1 << flag); }
- void AddFlag(FLAG_TYPE flag) { m_flags |= (1 << flag); }
- void DelFlag(FLAG_TYPE flag) { m_flags &= ~(1 << flag); }
+ T_FLAGS GetFlags() const { return m_flags; }
+ bool HasFlag(FLAG_TYPE flag) const { return m_flags & (1 << flag); }
+ void AddFlag(FLAG_TYPE flag) { m_flags |= (1 << flag); }
+ void DelFlag(FLAG_TYPE flag) { m_flags &= ~(1 << flag); }
T_VALUES GetValue(FLAG_TYPE flag) const { return m_values[flag]; }
- void SetValue(FLAG_TYPE flag, T_VALUES value) { m_values[flag] = value; }
- void AddValue(FLAG_TYPE flag, T_VALUES value) { m_values[flag] += value; }
+ void SetValue(FLAG_TYPE flag, T_VALUES value) { m_values[flag] = value; }
+ void AddValue(FLAG_TYPE flag, T_VALUES value) { m_values[flag] += value; }
private:
T_VALUES m_values[ARRAY_SIZE];
@@ -445,15 +445,15 @@ class TC_GAME_API WorldObject : public Object, public WorldLocation
void AddToWorld() override;
void RemoveFromWorld() override;
- void GetNearPoint2D(WorldObject const* searcher, float &x, float &y, float distance, float absAngle) const;
- void GetNearPoint(WorldObject const* searcher, float &x, float &y, float &z, float distance2d, float absAngle) const;
- void GetClosePoint(float &x, float &y, float &z, float size, float distance2d = 0, float relAngle = 0) const;
+ void GetNearPoint2D(WorldObject const* searcher, float& x, float& y, float distance, float absAngle) const;
+ void GetNearPoint(WorldObject const* searcher, float& x, float& y, float& z, float distance2d, float absAngle) const;
+ void GetClosePoint(float& x, float& y, float& z, float size, float distance2d = 0, float relAngle = 0) const;
void MovePosition(Position &pos, float dist, float angle);
Position GetNearPosition(float dist, float angle);
void MovePositionToFirstCollision(Position &pos, float dist, float angle);
Position GetFirstCollisionPosition(float dist, float angle);
Position GetRandomNearPosition(float radius);
- void GetContactPoint(WorldObject const* obj, float &x, float &y, float &z, float distance2d = CONTACT_DISTANCE) const;
+ void GetContactPoint(WorldObject const* obj, float& x, float& y, float& z, float distance2d = CONTACT_DISTANCE) const;
virtual float GetCombatReach() const { return 0.0f; } // overridden (only) in Unit
void UpdateGroundPositionZ(float x, float y, float &z) const;
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index e49678bb0db..7aba4547820 100644
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -2385,7 +2385,7 @@ class TC_GAME_API Player : public Unit, public GridObject<Player>
void StopCastingBindSight() const;
uint32 GetSaveTimer() const { return m_nextSave; }
- void SetSaveTimer(uint32 timer) { m_nextSave = timer; }
+ void SetSaveTimer(uint32 timer) { m_nextSave = timer; }
void SaveRecallPosition() { m_recall_location.WorldRelocate(*this); }
void Recall() { TeleportTo(m_recall_location); }
diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h
index d5dd44c836b..e42cce1e913 100644
--- a/src/server/game/Entities/Unit/Unit.h
+++ b/src/server/game/Entities/Unit/Unit.h
@@ -1657,11 +1657,11 @@ class TC_GAME_API Unit : public WorldObject
bool IsMagnet() const;
Unit* GetMeleeHitRedirectTarget(Unit* victim, SpellInfo const* spellInfo = nullptr);
- int32 SpellBaseDamageBonusDone(SpellSchoolMask schoolMask) const;
+ int32 SpellBaseDamageBonusDone(SpellSchoolMask schoolMask) const;
uint32 SpellDamageBonusDone(Unit* victim, SpellInfo const* spellProto, uint32 pdamage, DamageEffectType damagetype, SpellEffectInfo const& spellEffectInfo, uint32 stack = 1) const;
- float SpellDamagePctDone(Unit* victim, SpellInfo const* spellProto, DamageEffectType damagetype) const;
+ float SpellDamagePctDone(Unit* victim, SpellInfo const* spellProto, DamageEffectType damagetype) const;
uint32 SpellDamageBonusTaken(Unit* caster, SpellInfo const* spellProto, uint32 pdamage, DamageEffectType damagetype) const;
- int32 SpellBaseHealingBonusDone(SpellSchoolMask schoolMask) const;
+ int32 SpellBaseHealingBonusDone(SpellSchoolMask schoolMask) const;
uint32 SpellHealingBonusDone(Unit* victim, SpellInfo const* spellProto, uint32 healamount, DamageEffectType damagetype, SpellEffectInfo const& spellEffectInfo, uint32 stack = 1) const;
float SpellHealingPctDone(Unit* victim, SpellInfo const* spellProto) const;
uint32 SpellHealingBonusTaken(Unit* caster, SpellInfo const* spellProto, uint32 healamount, DamageEffectType damagetype) const;
@@ -1669,10 +1669,10 @@ class TC_GAME_API Unit : public WorldObject
uint32 MeleeDamageBonusDone(Unit* pVictim, uint32 damage, WeaponAttackType attType, DamageEffectType damagetype, SpellInfo const* spellProto = nullptr, SpellSchoolMask damageSchoolMask = SPELL_SCHOOL_MASK_NORMAL);
uint32 MeleeDamageBonusTaken(Unit* attacker, uint32 pdamage, WeaponAttackType attType, DamageEffectType damagetype, SpellInfo const* spellProto = nullptr, SpellSchoolMask damageSchoolMask = SPELL_SCHOOL_MASK_NORMAL);
- bool isSpellBlocked(Unit* victim, SpellInfo const* spellProto, WeaponAttackType attackType = BASE_ATTACK);
- bool isBlockCritical();
- float SpellCritChanceDone(Spell* spell, AuraEffect const* aurEff, SpellSchoolMask schoolMask, WeaponAttackType attackType = BASE_ATTACK) const;
- float SpellCritChanceTaken(Unit const* caster, Spell* spell, AuraEffect const* aurEff, SpellSchoolMask schoolMask, float doneChance, WeaponAttackType attackType = BASE_ATTACK) const;
+ bool isSpellBlocked(Unit* victim, SpellInfo const* spellProto, WeaponAttackType attackType = BASE_ATTACK);
+ bool isBlockCritical();
+ float SpellCritChanceDone(Spell* spell, AuraEffect const* aurEff, SpellSchoolMask schoolMask, WeaponAttackType attackType = BASE_ATTACK) const;
+ float SpellCritChanceTaken(Unit const* caster, Spell* spell, AuraEffect const* aurEff, SpellSchoolMask schoolMask, float doneChance, WeaponAttackType attackType = BASE_ATTACK) const;
static uint32 SpellCriticalDamageBonus(Unit const* caster, SpellInfo const* spellProto, uint32 damage, Unit* victim);
static uint32 SpellCriticalHealingBonus(Unit const* caster, SpellInfo const* spellProto, uint32 damage, Unit* victim);
@@ -1692,7 +1692,7 @@ class TC_GAME_API Unit : public WorldObject
static void CalcAbsorbResist(DamageInfo& damageInfo);
static void CalcHealAbsorb(HealInfo& healInfo);
- void UpdateSpeed(UnitMoveType mtype);
+ void UpdateSpeed(UnitMoveType mtype);
float GetSpeed(UnitMoveType mtype) const;
float GetSpeedRate(UnitMoveType mtype) const { return m_speed_rate[mtype]; }
void SetSpeed(UnitMoveType mtype, float newValue);
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 8036b054225..1cb5d55af8f 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -1725,7 +1725,7 @@ void ObjectMgr::LoadLinkedRespawn()
ObjectGuid::LowType guidLow = fields[0].GetUInt64();
ObjectGuid::LowType linkedGuidLow = fields[1].GetUInt64();
- uint8 linkType = fields[2].GetUInt8();
+ uint8 linkType = fields[2].GetUInt8();
ObjectGuid guid, linkedGuid;
bool error = false;
@@ -8318,7 +8318,7 @@ void ObjectMgr::LoadNPCSpellClickSpells()
uint8 userType = fields[3].GetUInt16();
if (userType >= SPELL_CLICK_USER_MAX)
- TC_LOG_ERROR("sql.sql", "Table npc_spellclick_spells creature: %u references unknown user type %u. Skipping entry.", npc_entry, uint32(userType));
+ TC_LOG_ERROR("sql.sql", "Table npc_spellclick_spells creature: %u references unknown user type %u. Skipping entry.", npc_entry, uint32(userType));
uint8 castFlags = fields[2].GetUInt8();
SpellClickInfo info;
@@ -9541,7 +9541,7 @@ void ObjectMgr::AddVendorItem(uint32 entry, VendorItem const& vItem, bool persis
bool ObjectMgr::RemoveVendorItem(uint32 entry, uint32 item, uint8 type, bool persist /*= true*/)
{
- CacheVendorItemContainer::iterator iter = _cacheVendorItemStore.find(entry);
+ CacheVendorItemContainer::iterator iter = _cacheVendorItemStore.find(entry);
if (iter == _cacheVendorItemStore.end())
return false;
diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.h b/src/server/game/Grids/Notifiers/GridNotifiers.h
index 5fee5746869..820fca5cdb1 100644
--- a/src/server/game/Grids/Notifiers/GridNotifiers.h
+++ b/src/server/game/Grids/Notifiers/GridNotifiers.h
@@ -833,7 +833,7 @@ namespace Trinity
private:
WorldObject const& i_obj;
GameobjectTypes i_type;
- float i_range;
+ float i_range;
// prevent clone this object
NearestGameObjectTypeInObjectRangeCheck(NearestGameObjectTypeInObjectRangeCheck const&) = delete;
@@ -1329,7 +1329,7 @@ namespace Trinity
private:
Creature* const i_obj;
Unit* const i_enemy;
- float i_range;
+ float i_range;
// prevent clone this object
NearestAssistCreatureInCreatureRangeCheck(NearestAssistCreatureInCreatureRangeCheck const&) = delete;
diff --git a/src/server/game/Groups/Group.h b/src/server/game/Groups/Group.h
index 8e33f830054..d833bbdc639 100644
--- a/src/server/game/Groups/Group.h
+++ b/src/server/game/Groups/Group.h
@@ -247,29 +247,29 @@ class TC_GAME_API Group
void Update(uint32 diff);
// group manipulation methods
- bool Create(Player* leader);
- void LoadGroupFromDB(Field* field);
+ bool Create(Player* leader);
+ void LoadGroupFromDB(Field* field);
void LoadMemberFromDB(ObjectGuid::LowType guidLow, uint8 memberFlags, uint8 subgroup, uint8 roles);
- bool AddInvite(Player* player);
- void RemoveInvite(Player* player);
- void RemoveAllInvites();
- bool AddLeaderInvite(Player* player);
- bool AddMember(Player* player);
- bool RemoveMember(ObjectGuid guid, RemoveMethod method = GROUP_REMOVEMETHOD_DEFAULT, ObjectGuid kicker = ObjectGuid::Empty, const char* reason = nullptr);
- void ChangeLeader(ObjectGuid guid, int8 partyIndex = 0);
- static void ConvertLeaderInstancesToGroup(Player* player, Group* group, bool switchLeader);
- void SetLootMethod(LootMethod method);
- void SetLooterGuid(ObjectGuid guid);
- void SetMasterLooterGuid(ObjectGuid guid);
- void UpdateLooterGuid(WorldObject* pLootedObject, bool ifneed = false);
- void SetLootThreshold(ItemQualities threshold);
- void Disband(bool hideDestroy = false);
- void SetLfgRoles(ObjectGuid guid, uint8 roles);
- uint8 GetLfgRoles(ObjectGuid guid);
- void SetEveryoneIsAssistant(bool apply);
+ bool AddInvite(Player* player);
+ void RemoveInvite(Player* player);
+ void RemoveAllInvites();
+ bool AddLeaderInvite(Player* player);
+ bool AddMember(Player* player);
+ bool RemoveMember(ObjectGuid guid, RemoveMethod method = GROUP_REMOVEMETHOD_DEFAULT, ObjectGuid kicker = ObjectGuid::Empty, const char* reason = nullptr);
+ void ChangeLeader(ObjectGuid guid, int8 partyIndex = 0);
+ static void ConvertLeaderInstancesToGroup(Player* player, Group* group, bool switchLeader);
+ void SetLootMethod(LootMethod method);
+ void SetLooterGuid(ObjectGuid guid);
+ void SetMasterLooterGuid(ObjectGuid guid);
+ void UpdateLooterGuid(WorldObject* pLootedObject, bool ifneed = false);
+ void SetLootThreshold(ItemQualities threshold);
+ void Disband(bool hideDestroy = false);
+ void SetLfgRoles(ObjectGuid guid, uint8 roles);
+ uint8 GetLfgRoles(ObjectGuid guid);
+ void SetEveryoneIsAssistant(bool apply);
// Update
- void UpdateReadyCheck(uint32 diff);
+ void UpdateReadyCheck(uint32 diff);
// Ready check
void StartReadyCheck(ObjectGuid starterGuid, int8 partyIndex, Milliseconds duration = Milliseconds(READYCHECK_DURATION));
diff --git a/src/server/game/Guilds/Guild.h b/src/server/game/Guilds/Guild.h
index d28aad1dd0e..62bd1c67828 100644
--- a/src/server/game/Guilds/Guild.h
+++ b/src/server/game/Guilds/Guild.h
@@ -294,7 +294,7 @@ class GuildBankRightsAndSlots
private:
uint8 tabId;
- int8 rights;
+ int8 rights;
int32 slots;
};
@@ -435,7 +435,7 @@ class TC_GAME_API Guild
GuildEventLogTypes m_eventType;
ObjectGuid::LowType m_playerGuid1;
ObjectGuid::LowType m_playerGuid2;
- uint8 m_newRank;
+ uint8 m_newRank;
};
// Bank event log entry
diff --git a/src/server/game/Loot/LootMgr.h b/src/server/game/Loot/LootMgr.h
index 138bcde08a3..96018801148 100644
--- a/src/server/game/Loot/LootMgr.h
+++ b/src/server/game/Loot/LootMgr.h
@@ -36,15 +36,15 @@ struct LootItem;
struct TC_GAME_API LootStoreItem
{
- uint32 itemid; // id of the item
- uint32 reference; // referenced TemplateleId
- float chance; // chance to drop for both quest and non-quest items, chance to be used for refs
- uint16 lootmode;
- bool needs_quest; // quest drop (quest is required for item to drop)
- uint8 groupid;
- uint8 mincount; // mincount for drop items
- uint8 maxcount; // max drop count for the item mincount or Ref multiplicator
- ConditionContainer conditions; // additional loot condition
+ uint32 itemid; // id of the item
+ uint32 reference; // referenced TemplateleId
+ float chance; // chance to drop for both quest and non-quest items, chance to be used for refs
+ uint16 lootmode;
+ bool needs_quest; // quest drop (quest is required for item to drop)
+ uint8 groupid;
+ uint8 mincount; // mincount for drop items
+ uint8 maxcount; // max drop count for the item mincount or Ref multiplicator
+ ConditionContainer conditions; // additional loot condition
// Constructor
// displayid is filled in IsValid() which must be called after
diff --git a/src/server/game/Movement/MovementGenerators/FlightPathMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/FlightPathMovementGenerator.cpp
index aded7c0524b..0e24449e9a3 100644
--- a/src/server/game/Movement/MovementGenerators/FlightPathMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/FlightPathMovementGenerator.cpp
@@ -151,7 +151,7 @@ void FlightPathMovementGenerator::DoFinalize(Player* owner, bool active, bool/*
if (owner->m_taxi.empty())
{
// update z position to ground and orientation for landing point
- // this prevent cheating with landing point at lags
+ // this prevent cheating with landing point at lags
// when client side flight end early in comparison server side
owner->StopMoving();
float mapHeight = owner->GetMap()->GetHeight(owner->GetPhaseShift(), _path[GetCurrentNode()]->Loc.X, _path[GetCurrentNode()]->Loc.Y, _path[GetCurrentNode()]->Loc.Z);
diff --git a/src/server/game/Movement/PathGenerator.h b/src/server/game/Movement/PathGenerator.h
index 817138d6a14..730efdcc995 100644
--- a/src/server/game/Movement/PathGenerator.h
+++ b/src/server/game/Movement/PathGenerator.h
@@ -26,7 +26,7 @@
class Unit;
-// 74*4.0f=296y number_of_points*interval = max_path_len
+// 74*4.0f=296y number_of_points*interval = max_path_len
// this is way more than actual evade range
// I think we can safely cut those down even more
#define MAX_PATH_LENGTH 74
diff --git a/src/server/game/OutdoorPvP/OutdoorPvPMgr.h b/src/server/game/OutdoorPvP/OutdoorPvPMgr.h
index f91a971597f..16eb87207ac 100644
--- a/src/server/game/OutdoorPvP/OutdoorPvPMgr.h
+++ b/src/server/game/OutdoorPvP/OutdoorPvPMgr.h
@@ -86,11 +86,11 @@ class TC_GAME_API OutdoorPvPMgr
// contains all initiated outdoor pvp events
// used when initing / cleaning up
- OutdoorPvPSet m_OutdoorPvPSet;
+ OutdoorPvPSet m_OutdoorPvPSet;
// maps the zone ids to an outdoor pvp event
// used in player event handling
- OutdoorPvPMap m_OutdoorPvPMap;
+ OutdoorPvPMap m_OutdoorPvPMap;
// Holds the outdoor PvP templates
OutdoorPvPScriptIds m_OutdoorPvPDatas;
diff --git a/src/server/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp
index 75c430ae6c2..306987c9d7f 100644
--- a/src/server/game/Pools/PoolMgr.cpp
+++ b/src/server/game/Pools/PoolMgr.cpp
@@ -604,7 +604,7 @@ void PoolMgr::LoadFromDB()
if (!result)
{
- TC_LOG_INFO("server.loading", ">> Loaded 0 creatures in pools. DB table `pool_creature` is empty.");
+ TC_LOG_INFO("server.loading", ">> Loaded 0 creatures in pools. DB table `pool_creature` is empty.");
}
else
{
@@ -661,7 +661,7 @@ void PoolMgr::LoadFromDB()
if (!result)
{
- TC_LOG_INFO("server.loading", ">> Loaded 0 gameobjects in pools. DB table `pool_gameobject` is empty.");
+ TC_LOG_INFO("server.loading", ">> Loaded 0 gameobjects in pools. DB table `pool_gameobject` is empty.");
}
else
{
diff --git a/src/server/game/Pools/PoolMgr.h b/src/server/game/Pools/PoolMgr.h
index 9628d206cb5..839f16cdc4e 100644
--- a/src/server/game/Pools/PoolMgr.h
+++ b/src/server/game/Pools/PoolMgr.h
@@ -31,13 +31,13 @@ class Quest;
struct PoolTemplateData
{
- uint32 MaxLimit;
+ uint32 MaxLimit;
};
struct PoolObject
{
- uint64 guid;
- float chance;
+ uint64 guid;
+ float chance;
PoolObject(uint64 _guid, float _chance);
};
diff --git a/src/server/game/Quests/QuestDef.h b/src/server/game/Quests/QuestDef.h
index 7468cd26926..8bf1db4407e 100644
--- a/src/server/game/Quests/QuestDef.h
+++ b/src/server/game/Quests/QuestDef.h
@@ -527,7 +527,7 @@ class TC_GAME_API Quest
uint32 GetSuggestedPlayers() const { return _suggestedPlayers; }
uint32 GetLimitTime() const { return _limitTime; }
int32 GetPrevQuestId() const { return _prevQuestID; }
- uint32 GetNextQuestId() const { return _nextQuestID; }
+ uint32 GetNextQuestId() const { return _nextQuestID; }
int32 GetExclusiveGroup() const { return _exclusiveGroup; }
int32 GetBreadcrumbForQuestId() const { return _breadcrumbForQuestId; }
uint32 GetNextQuestInChain() const { return _nextQuestInChain; }
@@ -555,7 +555,7 @@ class TC_GAME_API Quest
uint32 GetRewHonor() const { return _rewardHonor; }
uint32 GetRewKillHonor() const { return _rewardKillHonor; }
uint32 GetArtifactXPDifficulty() const { return _rewardArtifactXPDifficulty; }
- float GetArtifactXPMultiplier() const { return _rewardArtifactXPMultiplier; }
+ float GetArtifactXPMultiplier() const { return _rewardArtifactXPMultiplier; }
uint32 GetArtifactCategoryId() const { return _rewardArtifactCategoryID; }
uint32 GetRewMoneyMaxLevel() const; // use in XP calculation at client
uint32 GetRewSpell() const { return _rewardSpell; }
@@ -564,8 +564,8 @@ class TC_GAME_API Quest
uint32 GetRewMailSenderEntry() const { return _rewardMailSenderEntry; }
uint32 GetRewTitle() const { return _rewardTitleId; }
uint32 GetPOIContinent() const { return _poiContinent; }
- float GetPOIx() const { return _poix; }
- float GetPOIy() const { return _poiy; }
+ float GetPOIx() const { return _poix; }
+ float GetPOIy() const { return _poiy; }
uint32 GetPOIPriority() const { return _poiPriority; }
uint32 GetSoundAccept() const { return _soundAccept; }
uint32 GetSoundTurnIn() const { return _soundTurnIn; }
@@ -573,9 +573,9 @@ class TC_GAME_API Quest
uint32 GetCompleteEmote() const { return _emoteOnComplete; }
uint32 GetIncompleteEmoteDelay() const { return _emoteOnIncompleteDelay; }
uint32 GetCompleteEmoteDelay() const { return _emoteOnCompleteDelay; }
- bool IsRepeatable() const { return _specialFlags & QUEST_SPECIAL_FLAGS_REPEATABLE; }
- bool IsAutoAccept() const;
- bool IsAutoComplete() const;
+ bool IsRepeatable() const { return _specialFlags & QUEST_SPECIAL_FLAGS_REPEATABLE; }
+ bool IsAutoAccept() const;
+ bool IsAutoComplete() const;
uint32 GetFlags() const { return _flags; }
uint32 GetFlagsEx() const { return _flagsEx; }
uint32 GetFlagsEx2() const { return _flagsEx2; }
@@ -593,16 +593,16 @@ class TC_GAME_API Quest
int32 GetQuestGiverPortraitMount() const { return _questGiverPortraitMount; }
int32 GetQuestGiverPortraitModelSceneId() const { return _questGiverPortraitModelSceneId; }
uint32 GetQuestTurnInPortrait() const { return _questTurnInPortrait; }
- bool IsDaily() const { return (_flags & QUEST_FLAGS_DAILY) != 0; }
- bool IsWeekly() const { return (_flags & QUEST_FLAGS_WEEKLY) != 0; }
- bool IsMonthly() const { return (_specialFlags & QUEST_SPECIAL_FLAGS_MONTHLY) != 0; }
- bool IsSeasonal() const { return (_questSortID == -QUEST_SORT_SEASONAL || _questSortID == -QUEST_SORT_SPECIAL || _questSortID == -QUEST_SORT_LUNAR_FESTIVAL || _questSortID == -QUEST_SORT_MIDSUMMER || _questSortID == -QUEST_SORT_BREWFEST || _questSortID == -QUEST_SORT_LOVE_IS_IN_THE_AIR || _questSortID == -QUEST_SORT_NOBLEGARDEN) && !IsRepeatable(); }
- bool IsDailyOrWeekly() const { return (_flags & (QUEST_FLAGS_DAILY | QUEST_FLAGS_WEEKLY)) != 0; }
- bool IsRaidQuest(Difficulty difficulty) const;
- bool IsAllowedInRaid(Difficulty difficulty) const;
- bool IsDFQuest() const { return (_specialFlags & QUEST_SPECIAL_FLAGS_DF_QUEST) != 0; }
+ bool IsDaily() const { return (_flags & QUEST_FLAGS_DAILY) != 0; }
+ bool IsWeekly() const { return (_flags & QUEST_FLAGS_WEEKLY) != 0; }
+ bool IsMonthly() const { return (_specialFlags & QUEST_SPECIAL_FLAGS_MONTHLY) != 0; }
+ bool IsSeasonal() const { return (_questSortID == -QUEST_SORT_SEASONAL || _questSortID == -QUEST_SORT_SPECIAL || _questSortID == -QUEST_SORT_LUNAR_FESTIVAL || _questSortID == -QUEST_SORT_MIDSUMMER || _questSortID == -QUEST_SORT_BREWFEST || _questSortID == -QUEST_SORT_LOVE_IS_IN_THE_AIR || _questSortID == -QUEST_SORT_NOBLEGARDEN) && !IsRepeatable(); }
+ bool IsDailyOrWeekly() const { return (_flags & (QUEST_FLAGS_DAILY | QUEST_FLAGS_WEEKLY)) != 0; }
+ bool IsRaidQuest(Difficulty difficulty) const;
+ bool IsAllowedInRaid(Difficulty difficulty) const;
+ bool IsDFQuest() const { return (_specialFlags & QUEST_SPECIAL_FLAGS_DF_QUEST) != 0; }
uint32 CalculateHonorGain(uint8 level) const;
- bool CanIncreaseRewardedQuestCounters() const;
+ bool CanIncreaseRewardedQuestCounters() const;
// multiple values
std::vector<QuestRewardDisplaySpell> RewardDisplaySpell;
@@ -653,32 +653,32 @@ class TC_GAME_API Quest
uint32 _type = 0;
uint32 _packageID = 0;
uint32 _contentTuningID = 0;
- int32 _questSortID = 0;
+ int32 _questSortID = 0;
uint32 _questInfoID = 0;
uint32 _suggestedPlayers = 0;
uint32 _nextQuestInChain = 0;
uint32 _rewardXPDifficulty = 0;
- float _rewardXPMultiplier = 0.f;
- int32 _rewardMoney = 0;
+ float _rewardXPMultiplier = 0.f;
+ int32 _rewardMoney = 0;
uint32 _rewardMoneyDifficulty = 0;
- float _rewardMoneyMultiplier = 0.f;
+ float _rewardMoneyMultiplier = 0.f;
uint32 _rewardBonusMoney = 0;
uint32 _rewardSpell = 0;
uint32 _rewardHonor = 0;
uint32 _rewardKillHonor = 0;
uint32 _rewardArtifactXPDifficulty = 0;
- float _rewardArtifactXPMultiplier = 0.f;
+ float _rewardArtifactXPMultiplier = 0.f;
uint32 _rewardArtifactCategoryID = 0;
uint32 _sourceItemId = 0;
uint32 _flags = 0;
uint32 _flagsEx = 0;
uint32 _flagsEx2 = 0;
uint32 _poiContinent = 0;
- float _poix = 0.f;
- float _poiy = 0.f;
+ float _poix = 0.f;
+ float _poiy = 0.f;
uint32 _poiPriority = 0;
uint32 _rewardTitleId = 0;
- int32 _rewardArenaPoints = 0;
+ int32 _rewardArenaPoints = 0;
uint32 _rewardSkillId = 0;
uint32 _rewardSkillPoints = 0;
uint32 _questGiverPortrait = 0;
@@ -706,36 +706,36 @@ class TC_GAME_API Quest
std::string _questCompletionLog;
// quest_request_items table
- uint32 _emoteOnComplete = 0;
- uint32 _emoteOnIncomplete = 0;
- uint32 _emoteOnCompleteDelay = 0;
- uint32 _emoteOnIncompleteDelay = 0;
+ uint32 _emoteOnComplete = 0;
+ uint32 _emoteOnIncomplete = 0;
+ uint32 _emoteOnCompleteDelay = 0;
+ uint32 _emoteOnIncompleteDelay = 0;
std::string _requestItemsText;
// quest_offer_reward table
std::string _offerRewardText;
// quest_template_addon table (custom data)
- uint32 _maxLevel = 0;
- uint32 _allowableClasses = 0;
- uint32 _sourceSpellID = 0;
- int32 _prevQuestID = 0;
- uint32 _nextQuestID = 0;
- int32 _exclusiveGroup = 0;
- int32 _breadcrumbForQuestId = 0;
+ uint32 _maxLevel = 0;
+ uint32 _allowableClasses = 0;
+ uint32 _sourceSpellID = 0;
+ int32 _prevQuestID = 0;
+ uint32 _nextQuestID = 0;
+ int32 _exclusiveGroup = 0;
+ int32 _breadcrumbForQuestId = 0;
uint32 _rewardMailTemplateId = 0;
- uint32 _rewardMailDelay = 0;
- uint32 _requiredSkillId = 0;
- uint32 _requiredSkillPoints = 0;
+ uint32 _rewardMailDelay = 0;
+ uint32 _requiredSkillId = 0;
+ uint32 _requiredSkillPoints = 0;
uint32 _requiredMinRepFaction = 0;
- int32 _requiredMinRepValue = 0;
+ int32 _requiredMinRepValue = 0;
uint32 _requiredMaxRepFaction = 0;
- int32 _requiredMaxRepValue = 0;
- uint32 _sourceItemIdCount = 0;
+ int32 _requiredMaxRepValue = 0;
+ uint32 _sourceItemIdCount = 0;
uint32 _rewardMailSenderEntry = 0;
- uint32 _specialFlags = 0; // custom flags, not sniffed/WDB
+ uint32 _specialFlags = 0; // custom flags, not sniffed/WDB
std::bitset<MAX_QUEST_OBJECTIVE_TYPE> _usedQuestObjectiveTypes;
- uint32 _scriptId = 0;
+ uint32 _scriptId = 0;
// Helpers
static uint32 RoundXPValue(uint32 xp);
diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp
index fc3ad6e0e8b..f735d490903 100644
--- a/src/server/game/Server/WorldSession.cpp
+++ b/src/server/game/Server/WorldSession.cpp
@@ -804,7 +804,7 @@ void WorldSession::LoadAccountData(PreparedQueryResult result, uint32 mask)
if ((mask & (1 << type)) == 0)
{
- TC_LOG_ERROR("misc", "Table `%s` have non appropriate for table account data type (%u), ignore.",
+ TC_LOG_ERROR("misc", "Table `%s` have non appropriate for table account data type (%u), ignore.",
mask == GLOBAL_CACHE_MASK ? "account_data" : "character_account_data", type);
continue;
}
diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h
index 2645d7f5769..721593d49f0 100644
--- a/src/server/game/Spells/Spell.h
+++ b/src/server/game/Spells/Spell.h
@@ -703,7 +703,7 @@ class TC_GAME_API Spell
uint32 m_procAttacker; // Attacker trigger flags
uint32 m_procVictim; // Victim trigger flags
uint32 m_hitMask;
- void prepareDataForTriggerSystem();
+ void prepareDataForTriggerSystem();
// *****************************************
// Spell target subsystem
diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h
index caa5ec9a48c..a80007ddbf2 100644
--- a/src/server/game/World/World.h
+++ b/src/server/game/World/World.h
@@ -792,8 +792,8 @@ class TC_GAME_API World
bool IsBattlePetJournalLockAcquired(ObjectGuid battlenetAccountGuid);
uint32 GetCleaningFlags() const { return m_CleaningFlags; }
- void SetCleaningFlags(uint32 flags) { m_CleaningFlags = flags; }
- void ResetEventSeasonalQuests(uint16 event_id);
+ void SetCleaningFlags(uint32 flags) { m_CleaningFlags = flags; }
+ void ResetEventSeasonalQuests(uint16 event_id);
void ReloadRBAC();