diff options
Diffstat (limited to 'src')
32 files changed, 173 insertions, 173 deletions
diff --git a/src/server/game/AuctionHouseBot/AuctionHouseBotBuyer.h b/src/server/game/AuctionHouseBot/AuctionHouseBotBuyer.h index 08214d34c87..2116599bb51 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 7f6c3f6074b..814401cdbc5 100644 --- a/src/server/game/Battlefield/Battlefield.cpp +++ b/src/server/game/Battlefield/Battlefield.cpp @@ -697,7 +697,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 4b784277f4b..a289efa9708 100644 --- a/src/server/game/Battlegrounds/ArenaTeam.h +++ b/src/server/game/Battlegrounds/ArenaTeam.h @@ -125,9 +125,9 @@ class TC_GAME_API ArenaTeam typedef std::list<ArenaTeamMember> MemberList; - uint32 GetId() const { return TeamId; } - uint32 GetType() const { return Type; } - uint8 GetSlot() const { return GetSlotByType(GetType()); } + uint32 GetId() const { return TeamId; } + uint32 GetType() const { return Type; } + uint8 GetSlot() const { return GetSlotByType(GetType()); } static uint8 GetSlotByType(uint32 type); ObjectGuid GetCaptain() const { return CaptainGuid; } std::string const& GetName() const { return TeamName; } @@ -141,10 +141,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); @@ -169,14 +169,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); void UpdateArenaPointsHelper(std::map<uint32, uint32> & PlayerPoints); @@ -188,18 +188,18 @@ class TC_GAME_API ArenaTeam protected: - uint32 TeamId; - uint8 Type; + uint32 TeamId; + 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; + MemberList Members; ArenaTeamStats Stats; uint32 PreviousOpponents; diff --git a/src/server/game/Battlegrounds/Battleground.h b/src/server/game/Battlegrounds/Battleground.h index 58d40f28f13..16df877f2ef 100644 --- a/src/server/game/Battlegrounds/Battleground.h +++ b/src/server/game/Battlegrounds/Battleground.h @@ -185,8 +185,8 @@ enum BattlegroundStatus struct BattlegroundPlayer { - time_t OfflineRemoveTime; // for tracking and removing offline players from queue after 5 minutes - uint32 Team; // Player's team + time_t OfflineRemoveTime; // for tracking and removing offline players from queue after 5 minutes + uint32 Team; // Player's team }; struct BattlegroundObjectInfo @@ -524,7 +524,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 f431b8e5b7f..e8ce88a4da1 100644 --- a/src/server/game/Battlegrounds/BattlegroundQueue.h +++ b/src/server/game/Battlegrounds/BattlegroundQueue.h @@ -34,8 +34,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 ff03d8db7c3..9de5fef6e63 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.h @@ -89,7 +89,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 ec045a497dc..4de387d4eea 100644 --- a/src/server/game/Chat/Chat.h +++ b/src/server/game/Chat/Chat.h @@ -103,21 +103,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(char const* 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 9624fa9bf61..396297005b2 100644 --- a/src/server/game/DungeonFinding/LFGMgr.h +++ b/src/server/game/DungeonFinding/LFGMgr.h @@ -455,7 +455,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 e251a68ac66..2f1228a811d 100644 --- a/src/server/game/Entities/Item/Item.h +++ b/src/server/game/Entities/Item/Item.h @@ -155,7 +155,7 @@ class TC_GAME_API Item : public Object // spell charges (signed but stored as unsigned) int32 GetSpellCharges(uint8 index/*0..5*/ = 0) const { return GetInt32Value(ITEM_FIELD_SPELL_CHARGES + index); } - void SetSpellCharges(uint8 index/*0..5*/, int32 value) { SetInt32Value(ITEM_FIELD_SPELL_CHARGES + index, value); } + void SetSpellCharges(uint8 index/*0..5*/, int32 value) { SetInt32Value(ITEM_FIELD_SPELL_CHARGES + 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 cef6b44ede9..40c35f45a0d 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -3088,7 +3088,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(); @@ -3117,7 +3117,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(); @@ -3152,10 +3152,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 ed49c7ba121..74aedaee912 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -262,14 +262,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]; @@ -289,15 +289,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 80b3cd9e0cb..5145206a6db 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -1976,7 +1976,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 4292765833b..2e262910b6a 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -928,8 +928,8 @@ class TC_GAME_API Unit : public WorldObject bool IsStandState() const; void SetStandState(uint8 state); - void SetStandFlags(uint8 flags) { SetByteFlag(UNIT_FIELD_BYTES_1, UNIT_BYTES_1_OFFSET_VIS_FLAG, flags); } - void RemoveStandFlags(uint8 flags) { RemoveByteFlag(UNIT_FIELD_BYTES_1, UNIT_BYTES_1_OFFSET_VIS_FLAG, flags); } + void SetStandFlags(uint8 flags) { SetByteFlag(UNIT_FIELD_BYTES_1, UNIT_BYTES_1_OFFSET_VIS_FLAG, flags); } + void RemoveStandFlags(uint8 flags) { RemoveByteFlag(UNIT_FIELD_BYTES_1, UNIT_BYTES_1_OFFSET_VIS_FLAG, flags); } bool IsMounted() const { return HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_MOUNT); } uint32 GetMountID() const { return GetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID); } @@ -1146,7 +1146,7 @@ class TC_GAME_API Unit : public WorldObject DeathState getDeathState() const { return m_deathState; } virtual void setDeathState(DeathState s); // overwrited in Creature/Player/Pet - ObjectGuid GetOwnerGUID() const override { return GetGuidValue(UNIT_FIELD_SUMMONEDBY); } + ObjectGuid GetOwnerGUID() const override { return GetGuidValue(UNIT_FIELD_SUMMONEDBY); } void SetOwnerGUID(ObjectGuid owner); ObjectGuid GetCreatorGUID() const { return GetGuidValue(UNIT_FIELD_CREATEDBY); } void SetCreatorGUID(ObjectGuid creator) { SetGuidValue(UNIT_FIELD_CREATEDBY, creator); } @@ -1492,11 +1492,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, uint8 effIndex, Optional<float> const& donePctTotal, 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, uint8 effIndex, Optional<float> const& donePctTotal, uint32 stack = 1) const; float SpellHealingPctDone(Unit* victim, SpellInfo const* spellProto) const; uint32 SpellHealingBonusTaken(Unit* caster, SpellInfo const* spellProto, uint32 healamount, DamageEffectType damagetype) const; @@ -1504,10 +1504,10 @@ class TC_GAME_API Unit : public WorldObject uint32 MeleeDamageBonusDone(Unit* pVictim, uint32 damage, WeaponAttackType attType, SpellInfo const* spellProto = nullptr, SpellSchoolMask damageSchoolMask = SPELL_SCHOOL_MASK_NORMAL); uint32 MeleeDamageBonusTaken(Unit* attacker, uint32 pdamage, WeaponAttackType attType, 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(SpellInfo const* spellInfo, SpellSchoolMask schoolMask, WeaponAttackType attackType = BASE_ATTACK, bool isPeriodic = false) const; - float SpellCritChanceTaken(Unit const* caster, SpellInfo const* spellInfo, SpellSchoolMask schoolMask, float doneChance, WeaponAttackType attackType = BASE_ATTACK, bool isPeriodic = false) const; + bool isSpellBlocked(Unit* victim, SpellInfo const* spellProto, WeaponAttackType attackType = BASE_ATTACK); + bool isBlockCritical(); + float SpellCritChanceDone(SpellInfo const* spellInfo, SpellSchoolMask schoolMask, WeaponAttackType attackType = BASE_ATTACK, bool isPeriodic = false) const; + float SpellCritChanceTaken(Unit const* caster, SpellInfo const* spellInfo, SpellSchoolMask schoolMask, float doneChance, WeaponAttackType attackType = BASE_ATTACK, bool isPeriodic = false) 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); @@ -1533,7 +1533,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 ab847c2b1c8..ef677ef8ea3 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -1699,7 +1699,7 @@ void ObjectMgr::LoadLinkedRespawn() ObjectGuid::LowType guidLow = fields[0].GetUInt32(); ObjectGuid::LowType linkedGuidLow = fields[1].GetUInt32(); - uint8 linkType = fields[2].GetUInt8(); + uint8 linkType = fields[2].GetUInt8(); ObjectGuid guid, linkedGuid; bool error = false; @@ -8186,7 +8186,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; @@ -9377,7 +9377,7 @@ void ObjectMgr::AddVendorItem(uint32 entry, uint32 item, int32 maxcount, uint32 bool ObjectMgr::RemoveVendorItem(uint32 entry, uint32 item, 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 0c46383e4a9..ce3461d3bad 100644 --- a/src/server/game/Grids/Notifiers/GridNotifiers.h +++ b/src/server/game/Grids/Notifiers/GridNotifiers.h @@ -776,7 +776,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; @@ -1263,7 +1263,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 6ac1b9a9b9c..b92129de48f 100644 --- a/src/server/game/Groups/Group.h +++ b/src/server/game/Groups/Group.h @@ -136,7 +136,7 @@ class Roll : public LootValidatorRef ObjectGuid itemGUID; uint32 itemid; - int32 itemRandomPropId; + int32 itemRandomPropId; uint32 itemRandomSuffix; uint8 itemCount; typedef std::map<ObjectGuid, RollVote> PlayerVote; @@ -188,24 +188,24 @@ class TC_GAME_API Group void Update(uint32 diff); // group manipulation methods - 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 const& method = GROUP_REMOVEMETHOD_DEFAULT, ObjectGuid kicker = ObjectGuid::Empty, char const* reason = nullptr); - void ChangeLeader(ObjectGuid guid); - 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); + 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 const& method = GROUP_REMOVEMETHOD_DEFAULT, ObjectGuid kicker = ObjectGuid::Empty, char const* reason = nullptr); + void ChangeLeader(ObjectGuid guid); + 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); // properties accessories bool IsFull() const; diff --git a/src/server/game/Guilds/Guild.h b/src/server/game/Guilds/Guild.h index b0547cc3ac1..81d25d29cc3 100644 --- a/src/server/game/Guilds/Guild.h +++ b/src/server/game/Guilds/Guild.h @@ -259,8 +259,8 @@ class GuildBankRightsAndSlots int8 GetRights() const { return rights; } private: - uint8 tabId; - uint8 rights; + uint8 tabId; + uint8 rights; uint32 slots; }; @@ -381,7 +381,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 4709c67a5a4..ba6d5f901a3 100644 --- a/src/server/game/Loot/LootMgr.h +++ b/src/server/game/Loot/LootMgr.h @@ -34,15 +34,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/Mails/Mail.h b/src/server/game/Mails/Mail.h index 2b9dd78884d..d647cb5a671 100644 --- a/src/server/game/Mails/Mail.h +++ b/src/server/game/Mails/Mail.h @@ -110,10 +110,10 @@ class TC_GAME_API MailReceiver MailReceiver(Player* receiver, ObjectGuid::LowType receiver_lowguid); public: // Accessors Player* GetPlayer() const { return m_receiver; } - ObjectGuid::LowType GetPlayerGUIDLow() const { return m_receiver_lowguid; } + ObjectGuid::LowType GetPlayerGUIDLow() const { return m_receiver_lowguid; } private: Player* m_receiver; - ObjectGuid::LowType m_receiver_lowguid; + ObjectGuid::LowType m_receiver_lowguid; }; class TC_GAME_API MailDraft diff --git a/src/server/game/Movement/MovementGenerators/FlightPathMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/FlightPathMovementGenerator.cpp index e5d08696b6b..98609b7fe7a 100644 --- a/src/server/game/Movement/MovementGenerators/FlightPathMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/FlightPathMovementGenerator.cpp @@ -147,7 +147,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(_path[GetCurrentNode()]->LocX, _path[GetCurrentNode()]->LocY, _path[GetCurrentNode()]->LocZ); diff --git a/src/server/game/Movement/PathGenerator.h b/src/server/game/Movement/PathGenerator.h index cd6d256300e..3364820d124 100644 --- a/src/server/game/Movement/PathGenerator.h +++ b/src/server/game/Movement/PathGenerator.h @@ -27,7 +27,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/Movement/Spline/MoveSplineInitArgs.h b/src/server/game/Movement/Spline/MoveSplineInitArgs.h index d07d55aa3ec..1bc16e6d6be 100644 --- a/src/server/game/Movement/Spline/MoveSplineInitArgs.h +++ b/src/server/game/Movement/Spline/MoveSplineInitArgs.h @@ -33,8 +33,8 @@ namespace Movement struct { float x, y, z; } f; - uint64 target; - float angle; + uint64 target; + float angle; FacingInfo(float o) : angle(o) { } FacingInfo(uint64 t) : target(t) { } diff --git a/src/server/game/OutdoorPvP/OutdoorPvPMgr.h b/src/server/game/OutdoorPvP/OutdoorPvPMgr.h index 30f4838771b..3a0049492da 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 7e3d18ba098..4d4a30b391b 100644 --- a/src/server/game/Pools/PoolMgr.cpp +++ b/src/server/game/Pools/PoolMgr.cpp @@ -610,7 +610,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 { @@ -667,7 +667,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 b599e8183fd..6afe78206e0 100644 --- a/src/server/game/Pools/PoolMgr.h +++ b/src/server/game/Pools/PoolMgr.h @@ -27,13 +27,13 @@ struct PoolTemplateData { - uint32 MaxLimit; + uint32 MaxLimit; }; struct PoolObject { - ObjectGuid::LowType guid; - float chance; + ObjectGuid::LowType guid; + float chance; PoolObject(ObjectGuid::LowType _guid, float _chance) : guid(_guid), chance(std::fabs(_chance)) { } }; diff --git a/src/server/game/Quests/QuestDef.h b/src/server/game/Quests/QuestDef.h index d3989b7ec45..e855b0c60e2 100644 --- a/src/server/game/Quests/QuestDef.h +++ b/src/server/game/Quests/QuestDef.h @@ -257,35 +257,35 @@ class TC_GAME_API Quest std::string const& GetRequestItemsText() const { return _requestItemsText; } std::string const& GetAreaDescription() const { return _areaDescription; } std::string const& GetCompletedText() const { return _completedText; } - int32 GetRewOrReqMoney(Player const* player = nullptr) const; + int32 GetRewOrReqMoney(Player const* player = nullptr) const; uint32 GetRewHonorAddition() const { return _rewardHonor; } float GetRewHonorMultiplier() const { return _rewardKillHonor; } uint32 GetRewMoneyMaxLevel() const; // use in XP calculation at client uint32 GetRewSpell() const { return _rewardDisplaySpell; } - int32 GetRewSpellCast() const { return _rewardSpell; } + int32 GetRewSpellCast() const { return _rewardSpell; } uint32 GetRewMailTemplateId() const { return _rewardMailTemplateId; } uint32 GetRewMailDelaySecs() const { return _rewardMailDelay; } uint32 GetRewMailSenderEntry() const { return _rewardMailSenderEntry; } 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 GetPointOpt() const { return _poiPriority; } uint32 GetIncompleteEmote() const { return _emoteOnIncomplete; } uint32 GetCompleteEmote() const { return _emoteOnComplete; } - 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; } - 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 (_zoneOrSort == -QUEST_SORT_SEASONAL || _zoneOrSort == -QUEST_SORT_SPECIAL || _zoneOrSort == -QUEST_SORT_LUNAR_FESTIVAL || _zoneOrSort == -QUEST_SORT_MIDSUMMER || _zoneOrSort == -QUEST_SORT_BREWFEST || _zoneOrSort == -QUEST_SORT_LOVE_IS_IN_THE_AIR || _zoneOrSort == -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 (_zoneOrSort == -QUEST_SORT_SEASONAL || _zoneOrSort == -QUEST_SORT_SPECIAL || _zoneOrSort == -QUEST_SORT_LUNAR_FESTIVAL || _zoneOrSort == -QUEST_SORT_MIDSUMMER || _zoneOrSort == -QUEST_SORT_BREWFEST || _zoneOrSort == -QUEST_SORT_LOVE_IS_IN_THE_AIR || _zoneOrSort == -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 @@ -295,15 +295,15 @@ class TC_GAME_API Quest uint32 RequiredItemCount[QUEST_ITEM_OBJECTIVES_COUNT] = { }; uint32 ItemDrop[QUEST_SOURCE_ITEM_IDS_COUNT] = { }; uint32 ItemDropQuantity[QUEST_SOURCE_ITEM_IDS_COUNT] = { }; - int32 RequiredNpcOrGo[QUEST_OBJECTIVES_COUNT] = { }; // >0 Creature <0 Gameobject + int32 RequiredNpcOrGo[QUEST_OBJECTIVES_COUNT] = { }; // >0 Creature <0 Gameobject uint32 RequiredNpcOrGoCount[QUEST_OBJECTIVES_COUNT] = { }; uint32 RewardChoiceItemId[QUEST_REWARD_CHOICES_COUNT] = { }; uint32 RewardChoiceItemCount[QUEST_REWARD_CHOICES_COUNT] = { }; uint32 RewardItemId[QUEST_REWARDS_COUNT] = { }; uint32 RewardItemIdCount[QUEST_REWARDS_COUNT] = { }; uint32 RewardFactionId[QUEST_REPUTATIONS_COUNT] = { }; - int32 RewardFactionValueId[QUEST_REPUTATIONS_COUNT] = { }; - int32 RewardFactionValueIdOverride[QUEST_REPUTATIONS_COUNT] = { }; + int32 RewardFactionValueId[QUEST_REPUTATIONS_COUNT] = { }; + int32 RewardFactionValueIdOverride[QUEST_REPUTATIONS_COUNT] = { }; uint32 DetailsEmote[QUEST_EMOTE_COUNT] = { }; uint32 DetailsEmoteDelay[QUEST_EMOTE_COUNT] = { }; uint32 OfferRewardEmote[QUEST_EMOTE_COUNT] = { }; @@ -336,22 +336,22 @@ class TC_GAME_API Quest // table data uint32 _id = 0; uint32 _method = 0; - int32 _zoneOrSort = 0; + int32 _zoneOrSort = 0; uint32 _minLevel = 0; - int32 _level = 0; + int32 _level = 0; uint32 _type = 0; uint32 _allowableRaces = 0; uint32 _requiredFactionId1 = 0; - int32 _requiredFactionValue1 = 0; + int32 _requiredFactionValue1 = 0; uint32 _requiredFactionId2 = 0; - int32 _requiredFactionValue2 = 0; + int32 _requiredFactionValue2 = 0; uint32 _suggestedPlayers = 0; uint32 _timeAllowed = 0; uint32 _flags = 0; uint32 _rewardTitleId = 0; uint32 _requiredPlayerKills = 0; uint32 _rewardTalents = 0; - int32 _rewardArenaPoints = 0; + int32 _rewardArenaPoints = 0; uint32 _rewardNextQuest = 0; uint32 _rewardXPDifficulty = 0; uint32 _startItem = 0; @@ -364,36 +364,36 @@ class TC_GAME_API Quest std::string _completedText; uint32 _rewardHonor = 0; float _rewardKillHonor = 0.f; - int32 _rewardMoney = 0; + int32 _rewardMoney = 0; uint32 _rewardBonusMoney = 0; uint32 _rewardDisplaySpell = 0; - int32 _rewardSpell = 0; + int32 _rewardSpell = 0; uint32 _poiContinent = 0; - float _poiX = 0.f; - float _poiY = 0.f; + float _poiX = 0.f; + float _poiY = 0.f; uint32 _poiPriority = 0; uint32 _emoteOnIncomplete = 0; uint32 _emoteOnComplete = 0; // quest_template_addon table (custom data) - uint32 _maxLevel = 0; - uint32 _requiredClasses = 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 _maxLevel = 0; + uint32 _requiredClasses = 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 _requiredMinRepFaction = 0; - int32 _requiredMinRepValue = 0; + int32 _requiredMinRepValue = 0; uint32 _requiredMaxRepFaction = 0; - int32 _requiredMaxRepValue = 0; - uint32 _startItemCount = 0; + int32 _requiredMaxRepValue = 0; + uint32 _startItemCount = 0; uint32 _rewardMailSenderEntry = 0; - uint32 _specialFlags = 0; // custom flags, not sniffed/WDB + uint32 _specialFlags = 0; // custom flags, not sniffed/WDB // Helpers static uint32 RoundXPValue(uint32 xp); diff --git a/src/server/game/Reputation/ReputationMgr.h b/src/server/game/Reputation/ReputationMgr.h index 0597cb609cd..155aae1725c 100644 --- a/src/server/game/Reputation/ReputationMgr.h +++ b/src/server/game/Reputation/ReputationMgr.h @@ -50,7 +50,7 @@ struct FactionState { uint32 ID; RepListID ReputationListID; - int32 Standing; + int32 Standing; uint8 Flags; bool needSend; bool needSave; diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index db3f970d019..2393eac3c7f 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -736,7 +736,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/Auras/SpellAuras.h b/src/server/game/Spells/Auras/SpellAuras.h index 2bc548ecced..c298ed82706 100644 --- a/src/server/game/Spells/Auras/SpellAuras.h +++ b/src/server/game/Spells/Auras/SpellAuras.h @@ -164,12 +164,12 @@ class TC_GAME_API Aura bool ModStackAmount(int32 num, AuraRemoveMode removeMode = AURA_REMOVE_BY_DEFAULT, bool resetPeriodicTimer = true); bool CanApplyResilience() const { return _casterInfo.ApplyResilience; } - void SetCanApplyResilience(bool val) { _casterInfo.ApplyResilience = val; } + void SetCanApplyResilience(bool val) { _casterInfo.ApplyResilience = val; } uint8 GetCasterLevel() const { return _casterInfo.Level; } float GetCritChance() const { return _casterInfo.CritChance; } - void SetCritChance(float val) { _casterInfo.CritChance = val; } + void SetCritChance(float val) { _casterInfo.CritChance = val; } float GetDonePct() const { return _casterInfo.BonusDonePct; } - void SetDonePct(float val) { _casterInfo.BonusDonePct = val; } + void SetDonePct(float val) { _casterInfo.BonusDonePct = val; } bool HasMoreThanOneEffectForType(AuraType auraType) const; bool IsArea() const; diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h index 4f29a1ea762..08c80d8518e 100644 --- a/src/server/game/Spells/Spell.h +++ b/src/server/game/Spells/Spell.h @@ -635,7 +635,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/Texts/CreatureTextMgr.h b/src/server/game/Texts/CreatureTextMgr.h index 57be35b2614..5f1a9985347 100644 --- a/src/server/game/Texts/CreatureTextMgr.h +++ b/src/server/game/Texts/CreatureTextMgr.h @@ -91,7 +91,7 @@ class TC_GAME_API CreatureTextMgr void LoadCreatureTexts(); void LoadCreatureTextLocales(); - CreatureTextMap const& GetTextMap() const { return mTextMap; } + CreatureTextMap const& GetTextMap() const { return mTextMap; } void SendSound(Creature* source, uint32 sound, ChatMsg msgType, WorldObject const* whisperTarget, CreatureTextRange range, Team team, bool gmOnly); void SendEmote(Unit* source, uint32 emote); diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index ffcac67dbc9..df44b05c88f 100644 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -762,8 +762,8 @@ class TC_GAME_API World void UpdateAreaDependentAuras(); 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(); |