diff options
Diffstat (limited to 'src')
34 files changed, 95 insertions, 95 deletions
diff --git a/src/server/game/AI/CoreAI/CombatAI.h b/src/server/game/AI/CoreAI/CombatAI.h index b3d7b580697..94f11ba8431 100755 --- a/src/server/game/AI/CoreAI/CombatAI.h +++ b/src/server/game/AI/CoreAI/CombatAI.h @@ -44,7 +44,7 @@ class CombatAI : public CreatureAI void InitializeAI(); void Reset(); void EnterCombat(Unit* who); - void JustDied(Unit *killer); + void JustDied(Unit* killer); void UpdateAI(const uint32 diff); static int Permissible(const Creature *); protected: diff --git a/src/server/game/AI/CoreAI/PassiveAI.h b/src/server/game/AI/CoreAI/PassiveAI.h index fa76a836e83..be78918c608 100755 --- a/src/server/game/AI/CoreAI/PassiveAI.h +++ b/src/server/game/AI/CoreAI/PassiveAI.h @@ -40,7 +40,7 @@ class PossessedAI : public CreatureAI explicit PossessedAI(Creature *c); void MoveInLineOfSight(Unit *) {} - void AttackStart(Unit *target); + void AttackStart(Unit* target); void UpdateAI(const uint32); void EnterEvadeMode() {} diff --git a/src/server/game/AI/CoreAI/PetAI.h b/src/server/game/AI/CoreAI/PetAI.h index 05841dbfa5e..2e0e451ef28 100755 --- a/src/server/game/AI/CoreAI/PetAI.h +++ b/src/server/game/AI/CoreAI/PetAI.h @@ -38,7 +38,7 @@ class PetAI : public CreatureAI static int Permissible(const Creature *); void KilledUnit(Unit* /*victim*/); - void AttackStart(Unit *target); + void AttackStart(Unit* target); void MovementInform(uint32 moveType, uint32 data); private: @@ -56,9 +56,9 @@ class PetAI : public CreatureAI Unit *SelectNextTarget(); void HandleReturnMovement(); - void DoAttack(Unit *target, bool chase); - bool _CanAttack(Unit *target); - bool _CheckTargetCC(Unit *target); + void DoAttack(Unit* target, bool chase); + bool _CanAttack(Unit* target); + bool _CheckTargetCC(Unit* target); }; #endif diff --git a/src/server/game/AI/CreatureAIImpl.h b/src/server/game/AI/CreatureAIImpl.h index 30a981cfef2..919039166ce 100755 --- a/src/server/game/AI/CreatureAIImpl.h +++ b/src/server/game/AI/CreatureAIImpl.h @@ -497,7 +497,7 @@ struct AISpellInfoType AISpellInfoType * GetAISpellInfo(uint32 i); -inline void CreatureAI::SetGazeOn(Unit *target) +inline void CreatureAI::SetGazeOn(Unit* target) { if (me->canAttack(target)) { @@ -519,7 +519,7 @@ inline bool CreatureAI::UpdateVictimWithGaze() me->SetReactState(REACT_AGGRESSIVE); } - if (Unit *victim = me->SelectVictim()) + if (Unit* victim = me->SelectVictim()) AttackStart(victim); return me->getVictim(); } @@ -531,7 +531,7 @@ inline bool CreatureAI::UpdateVictim() if (!me->HasReactState(REACT_PASSIVE)) { - if (Unit *victim = me->SelectVictim()) + if (Unit* victim = me->SelectVictim()) AttackStart(victim); return me->getVictim(); } diff --git a/src/server/game/AI/ScriptedAI/ScriptedSimpleAI.h b/src/server/game/AI/ScriptedAI/ScriptedSimpleAI.h index f50372027af..246f1b9df3e 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedSimpleAI.h +++ b/src/server/game/AI/ScriptedAI/ScriptedSimpleAI.h @@ -31,7 +31,7 @@ struct SimpleAI : public ScriptedAI void KilledUnit(Unit* /*victim*/); - void DamageTaken(Unit *killer, uint32 &damage); + void DamageTaken(Unit* killer, uint32 &damage); void UpdateAI(const uint32 diff); diff --git a/src/server/game/Battlegrounds/Battleground.h b/src/server/game/Battlegrounds/Battleground.h index a765a1c239b..f077036a635 100755 --- a/src/server/game/Battlegrounds/Battleground.h +++ b/src/server/game/Battlegrounds/Battleground.h @@ -509,7 +509,7 @@ class Battleground // must be implemented in BG subclass virtual void HandleAreaTrigger(Player* /*Source*/, uint32 /*Trigger*/) {} // must be implemented in BG subclass if need AND call base class generic code - virtual void HandleKillPlayer(Player *player, Player *killer); + virtual void HandleKillPlayer(Player* player, Player* killer); virtual void HandleKillUnit(Creature* /*unit*/, Player* /*killer*/); // Battleground events diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAA.h b/src/server/game/Battlegrounds/Zones/BattlegroundAA.h index aa27c0de322..4aeed964986 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAA.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAA.h @@ -45,6 +45,6 @@ class BattlegroundAA : public Battleground void RemovePlayer(Player *plr, uint64 guid); void HandleAreaTrigger(Player *Source, uint32 Trigger); bool SetupBattleground(); - void HandleKillPlayer(Player* player, Player *killer); + void HandleKillPlayer(Player* player, Player* killer); }; #endif diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.h b/src/server/game/Battlegrounds/Zones/BattlegroundAV.h index c50ee1c2a80..4184863ea3a 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.h @@ -1557,9 +1557,9 @@ class BattlegroundAV : public Battleground /*handlestuff*/ //these are functions which get called from extern virtual void EventPlayerClickedOnFlag(Player *source, GameObject* target_obj); - void HandleKillPlayer(Player* player, Player *killer); - void HandleKillUnit(Creature *unit, Player *killer); - void HandleQuestComplete(uint32 questid, Player *player); + void HandleKillPlayer(Player* player, Player* killer); + void HandleKillUnit(Creature* unit, Player* killer); + void HandleQuestComplete(uint32 questid, Player* player); bool PlayerCanDoMineQuest(int32 GOId, uint32 team); void EndBattleground(uint32 winner); diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundBE.h b/src/server/game/Battlegrounds/Zones/BattlegroundBE.h index 4756b9aa45a..5db6e13df89 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundBE.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundBE.h @@ -67,7 +67,7 @@ class BattlegroundBE : public Battleground bool SetupBattleground(); virtual void Reset(); virtual void FillInitialWorldStates(WorldPacket &d); - void HandleKillPlayer(Player* player, Player *killer); + void HandleKillPlayer(Player* player, Player* killer); bool HandlePlayerUnderMap(Player* plr); /* Scorekeeping */ diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundDS.h b/src/server/game/Battlegrounds/Zones/BattlegroundDS.h index 4a44a375049..bc4d8e4585b 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundDS.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundDS.h @@ -76,7 +76,7 @@ class BattlegroundDS : public Battleground bool SetupBattleground(); virtual void Reset(); virtual void FillInitialWorldStates(WorldPacket &d); - void HandleKillPlayer(Player* player, Player *killer); + void HandleKillPlayer(Player* player, Player* killer); bool HandlePlayerUnderMap(Player* plr); private: uint32 m_waterTimer; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h index 91d3534b4cd..7161de16bce 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h @@ -351,7 +351,7 @@ class BattlegroundEY : public Battleground void RemovePlayer(Player *plr, uint64 guid); void HandleBuffUse(uint64 const& buff_guid); void HandleAreaTrigger(Player *Source, uint32 Trigger); - void HandleKillPlayer(Player *player, Player *killer); + void HandleKillPlayer(Player* player, Player* killer); virtual WorldSafeLocsEntry const* GetClosestGraveYard(Player* player); virtual bool SetupBattleground(); virtual void Reset(); diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundIC.h b/src/server/game/Battlegrounds/Zones/BattlegroundIC.h index d2cf410d3d4..95cdf1017d8 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundIC.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundIC.h @@ -873,7 +873,7 @@ class BattlegroundIC : public Battleground void HandleAreaTrigger(Player *Source, uint32 Trigger); bool SetupBattleground(); void SpawnLeader(uint32 teamid); - void HandleKillUnit(Creature *unit, Player *killer); + void HandleKillUnit(Creature* unit, Player* killer); void HandleKillPlayer(Player* player, Player* killer); void EndBattleground(uint32 winner); void EventPlayerClickedOnFlag(Player *source, GameObject* /*target_obj*/); diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundNA.h b/src/server/game/Battlegrounds/Zones/BattlegroundNA.h index ba0011bba30..6ae4c77b1e4 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundNA.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundNA.h @@ -68,7 +68,7 @@ class BattlegroundNA : public Battleground bool SetupBattleground(); virtual void Reset(); virtual void FillInitialWorldStates(WorldPacket &d); - void HandleKillPlayer(Player* player, Player *killer); + void HandleKillPlayer(Player* player, Player* killer); bool HandlePlayerUnderMap(Player* plr); }; #endif diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundRL.h b/src/server/game/Battlegrounds/Zones/BattlegroundRL.h index a58e09431dd..84b4d939678 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundRL.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundRL.h @@ -64,7 +64,7 @@ class BattlegroundRL : public Battleground void RemovePlayer(Player *plr, uint64 guid); void HandleAreaTrigger(Player *Source, uint32 Trigger); bool SetupBattleground(); - void HandleKillPlayer(Player* player, Player *killer); + void HandleKillPlayer(Player* player, Player* killer); bool HandlePlayerUnderMap(Player* plr); }; #endif diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundRV.h b/src/server/game/Battlegrounds/Zones/BattlegroundRV.h index a87fb7e3f3d..7674bc459d0 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundRV.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundRV.h @@ -121,7 +121,7 @@ class BattlegroundRV : public Battleground void RemovePlayer(Player *plr, uint64 guid); void HandleAreaTrigger(Player *Source, uint32 Trigger); bool SetupBattleground(); - void HandleKillPlayer(Player* player, Player *killer); + void HandleKillPlayer(Player* player, Player* killer); bool HandlePlayerUnderMap(Player* plr); private: diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundSA.h b/src/server/game/Battlegrounds/Zones/BattlegroundSA.h index 2a972f5a7d0..df753df3020 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundSA.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundSA.h @@ -536,7 +536,7 @@ class BattlegroundSA : public Battleground void UpdateDemolisherSpawns(); /// Send packet to player for create boats (client part) - void SendTransportInit(Player *player); + void SendTransportInit(Player* player); /// Send packet to player for destroy boats (client part) void SendTransportsRemove(Player* player); diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundWS.h b/src/server/game/Battlegrounds/Zones/BattlegroundWS.h index 61fa3654f8b..6bffd479da0 100755 --- a/src/server/game/Battlegrounds/Zones/BattlegroundWS.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundWS.h @@ -192,7 +192,7 @@ class BattlegroundWS : public Battleground void RemovePlayer(Player *plr, uint64 guid); void HandleAreaTrigger(Player *Source, uint32 Trigger); - void HandleKillPlayer(Player *player, Player *killer); + void HandleKillPlayer(Player* player, Player* killer); bool SetupBattleground(); virtual void Reset(); void EndBattleground(uint32 winner); diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index aeeb4ae7291..45429a9206e 100755 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -559,7 +559,7 @@ class Creature : public Unit, public GridObject<Creature> Player *GetLootRecipient() const; Group *GetLootRecipientGroup() const; bool hasLootRecipient() const { return m_lootRecipient || m_lootRecipientGroup; } - bool isTappedBy(Player *player) const; // return true if the creature is tapped by the player or a member of his party. + bool isTappedBy(Player* player) const; // return true if the creature is tapped by the player or a member of his party. void SetLootRecipient (Unit* unit); void AllLootRemovedFromCorpse(); diff --git a/src/server/game/Entities/Creature/CreatureGroups.h b/src/server/game/Entities/Creature/CreatureGroups.h index 5f1863f83c3..d68d18b788d 100755 --- a/src/server/game/Entities/Creature/CreatureGroups.h +++ b/src/server/game/Entities/Creature/CreatureGroups.h @@ -36,7 +36,7 @@ class CreatureGroupManager friend class ACE_Singleton<CreatureGroupManager, ACE_Null_Mutex>; public: void AddCreatureToGroup(uint32 group_id, Creature *creature); - void RemoveCreatureFromGroup(CreatureGroup *group, Creature *creature); + void RemoveCreatureFromGroup(CreatureGroup* group, Creature *creature); void LoadCreatureFormations(); }; @@ -66,12 +66,12 @@ class CreatureGroup bool isEmpty() const { return m_members.empty(); } bool isFormed() const { return m_Formed; } - void AddMember(Creature *member); - void RemoveMember(Creature *member); + void AddMember(Creature* member); + void RemoveMember(Creature* member); void FormationReset(bool dismiss); void LeaderMoveTo(float x, float y, float z); - void MemberAttackStart(Creature* member, Unit *target); + void MemberAttackStart(Creature* member, Unit* target); }; #endif diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h index 2941861ef9b..6634760fdfd 100755 --- a/src/server/game/Entities/GameObject/GameObject.h +++ b/src/server/game/Entities/GameObject/GameObject.h @@ -764,7 +764,7 @@ class GameObject : public WorldObject, public GridObject<GameObject> GameObject* LookupFishingHoleAround(float range); - void CastSpell(Unit *target, uint32 spell); + void CastSpell(Unit* target, uint32 spell); void SendCustomAnim(uint32 anim); bool IsInRange(float x, float y, float z, float radius) const; void TakenDamage(uint32 damage, Unit* who = NULL); diff --git a/src/server/game/Entities/Item/Item.h b/src/server/game/Entities/Item/Item.h index a584be963fc..46dce2cf744 100755 --- a/src/server/game/Entities/Item/Item.h +++ b/src/server/game/Entities/Item/Item.h @@ -322,8 +322,8 @@ class Item : public Object // Update States ItemUpdateState GetState() const { return uState; } void SetState(ItemUpdateState state, Player *forplayer = NULL); - void AddToUpdateQueueOf(Player *player); - void RemoveFromUpdateQueueOf(Player *player); + void AddToUpdateQueueOf(Player* player); + void RemoveFromUpdateQueueOf(Player* player); bool IsInUpdateQueue() const { return uQueuePos != -1; } uint16 GetQueuePos() const { return uQueuePos; } void FSetState(ItemUpdateState state) // forced diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index 13e8ca29970..3c2ce47bf34 100755 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -470,7 +470,7 @@ struct Position bool IsInDist(const Position *pos, float dist) const { return GetExactDistSq(pos) < dist * dist; } bool HasInArc(float arcangle, const Position *pos) const; - bool HasInLine(const Unit *target, float distance, float width) const; + bool HasInLine(const Unit* target, float distance, float width) const; std::string ToString() const; }; ByteBuffer &operator>>(ByteBuffer& buf, Position::PositionXYZOStreamer const & streamer); diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 84f7e1edd86..e2367b2d864 100755 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -1030,8 +1030,8 @@ private: class Player : public Unit, public GridObject<Player> { friend class WorldSession; - friend void Item::AddToUpdateQueueOf(Player *player); - friend void Item::RemoveFromUpdateQueueOf(Player *player); + friend void Item::AddToUpdateQueueOf(Player* player); + friend void Item::RemoveFromUpdateQueueOf(Player* player); public: explicit Player (WorldSession *session); ~Player (); @@ -1658,7 +1658,7 @@ class Player : public Unit, public GridObject<Player> bool IsAffectedBySpellmod(SpellEntry const *spellInfo, SpellModifier *mod, Spell* spell = NULL); template <class T> T ApplySpellMod(uint32 spellId, SpellModOp op, T &basevalue, Spell* spell = NULL); void RemoveSpellMods(Spell* spell); - void RestoreSpellMods(Spell *spell, uint32 ownerAuraId=0); + void RestoreSpellMods(Spell* spell, uint32 ownerAuraId=0); void DropModCharge(SpellModifier* mod, Spell* spell); void SetSpellModTakingSpell(Spell* spell, bool apply); @@ -1694,7 +1694,7 @@ class Player : public Unit, public GridObject<Player> void UpdatePotionCooldown(Spell* spell = NULL); // global cooldown - void AddGlobalCooldown(SpellEntry const *spellInfo, Spell *spell); + void AddGlobalCooldown(SpellEntry const *spellInfo, Spell* spell); bool HasGlobalCooldown(SpellEntry const *spellInfo) const; void RemoveGlobalCooldown(SpellEntry const *spellInfo); @@ -1885,7 +1885,7 @@ class Player : public Unit, public GridObject<Player> void SendAttackSwingDeadTarget(); void SendAttackSwingNotInRange(); void SendAttackSwingBadFacingAttack(); - void SendAutoRepeatCancel(Unit *target); + void SendAutoRepeatCancel(Unit* target); void SendExplorationExperience(uint32 Area, uint32 Experience); void SendDungeonDifficulty(bool IsInGroup); @@ -2060,9 +2060,9 @@ class Player : public Unit, public GridObject<Player> void ApplyItemEquipSpell(Item *item, bool apply, bool form_change = false); void ApplyEquipSpell(SpellEntry const* spellInfo, Item* item, bool apply, bool form_change = false); void UpdateEquipSpellsAtFormChange(); - void CastItemCombatSpell(Unit *target, WeaponAttackType attType, uint32 procVictim, uint32 procEx); + void CastItemCombatSpell(Unit* target, WeaponAttackType attType, uint32 procVictim, uint32 procEx); void CastItemUseSpell(Item *item, SpellCastTargets const& targets, uint8 cast_count, uint32 glyphIndex); - void CastItemCombatSpell(Unit *target, WeaponAttackType attType, uint32 procVictim, uint32 procEx, Item *item, ItemTemplate const* proto); + void CastItemCombatSpell(Unit* target, WeaponAttackType attType, uint32 procVictim, uint32 procEx, Item *item, ItemTemplate const* proto); void SendEquipmentSetList(); void SetEquipmentSet(uint32 index, EquipmentSet eqset); @@ -2073,7 +2073,7 @@ class Player : public Unit, public GridObject<Player> void SendDirectMessage(WorldPacket *data); void SendBGWeekendWorldStates(); - void SendAurasForTarget(Unit *target); + void SendAurasForTarget(Unit* target); PlayerMenu* PlayerTalkClass; std::vector<ItemSetEffect *> ItemSetEff; @@ -2339,7 +2339,7 @@ class Player : public Unit, public GridObject<Player> bool HasPendingBind() const { return _pendingBind != NULL; } void SendRaidInfo(); void SendSavedInstances(); - static void ConvertInstancesToGroup(Player *player, Group *group, bool switchLeader); + static void ConvertInstancesToGroup(Player* player, Group* group, bool switchLeader); bool Satisfy(AccessRequirement const* ar, uint32 target_map, bool report = false); bool CheckInstanceLoginValid(); bool CheckInstanceCount(uint32 instanceId) const @@ -2364,11 +2364,11 @@ class Player : public Unit, public GridObject<Player> /*********************************************************/ Group * GetGroupInvite() { return m_groupInvite; } - void SetGroupInvite(Group *group) { m_groupInvite = group; } + void SetGroupInvite(Group* group) { m_groupInvite = group; } Group * GetGroup() { return m_group.getTarget(); } const Group * GetGroup() const { return (const Group*)m_group.getTarget(); } GroupReference& GetGroupRef() { return m_group; } - void SetGroup(Group *group, int8 subgroup = -1); + void SetGroup(Group* group, int8 subgroup = -1); uint8 GetSubGroup() const { return m_group.getSubGroup(); } uint32 GetGroupUpdateFlag() const { return m_groupUpdateMask; } void SetGroupUpdateFlag(uint32 flag) { m_groupUpdateMask |= flag; } @@ -2377,12 +2377,12 @@ class Player : public Unit, public GridObject<Player> Player* GetNextRandomRaidMember(float radius); PartyResult CanUninviteFromGroup() const; // Battleground Group System - void SetBattlegroundRaid(Group *group, int8 subgroup = -1); + void SetBattlegroundRaid(Group* group, int8 subgroup = -1); void RemoveFromBattlegroundRaid(); Group * GetOriginalGroup() { return m_originalGroup.getTarget(); } GroupReference& GetOriginalGroupRef() { return m_originalGroup; } uint8 GetOriginalSubGroup() const { return m_originalGroup.getSubGroup(); } - void SetOriginalGroup(Group *group, int8 subgroup = -1); + void SetOriginalGroup(Group* group, int8 subgroup = -1); void SetPassOnGroupLoot(bool bPassOnGroupLoot) { m_bPassOnGroupLoot = bPassOnGroupLoot; } bool GetPassOnGroupLoot() const { return m_bPassOnGroupLoot; } diff --git a/src/server/game/Entities/Player/SocialMgr.h b/src/server/game/Entities/Player/SocialMgr.h index 796196bfeab..67921b03a01 100755 --- a/src/server/game/Entities/Player/SocialMgr.h +++ b/src/server/game/Entities/Player/SocialMgr.h @@ -145,11 +145,11 @@ class SocialMgr // Misc void RemovePlayerSocial(uint32 guid) { m_socialMap.erase(guid); } - void GetFriendInfo(Player *player, uint32 friendGUID, FriendInfo &friendInfo); + void GetFriendInfo(Player* player, uint32 friendGUID, FriendInfo &friendInfo); // Packet management void MakeFriendStatusPacket(FriendsResult result, uint32 friend_guid, WorldPacket *data); - void SendFriendStatus(Player *player, FriendsResult result, uint32 friend_guid, bool broadcast); - void BroadcastToFriendListers(Player *player, WorldPacket *packet); + void SendFriendStatus(Player* player, FriendsResult result, uint32 friend_guid, bool broadcast); + void BroadcastToFriendListers(Player* player, WorldPacket *packet); // Loading PlayerSocial *LoadFromDB(PreparedQueryResult result, uint32 guid); private: diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 9912b6b638c..12884f76951 100755 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -1213,7 +1213,7 @@ class Unit : public WorldObject return NULL; } - bool Attack(Unit *victim, bool meleeAttack); + bool Attack(Unit* victim, bool meleeAttack); void CastStop(uint32 except_spellid = 0); bool AttackStop(); void RemoveAllAttackers(); @@ -1480,21 +1480,21 @@ class Unit : public WorldObject void CastCustomSpell(uint32 spellId, SpellValueMod mod, int32 value, Unit* Victim = NULL, bool triggered = true, Item *castItem = NULL, AuraEffect const* triggeredByAura = NULL, uint64 originalCaster = 0); void CastCustomSpell(uint32 spellId, CustomSpellValues const &value, Unit* Victim = NULL, bool triggered = true, Item *castItem = NULL, AuraEffect const* triggeredByAura = NULL, uint64 originalCaster = 0); void CastSpell(GameObject *go, uint32 spellId, bool triggered, Item *castItem = NULL, AuraEffect* triggeredByAura = NULL, uint64 originalCaster = 0); - Aura * AddAura(uint32 spellId, Unit *target); - Aura * AddAura(SpellEntry const *spellInfo, uint8 effMask, Unit *target); - void SetAuraStack(uint32 spellId, Unit *target, uint32 stack); + Aura * AddAura(uint32 spellId, Unit* target); + Aura * AddAura(SpellEntry const *spellInfo, uint8 effMask, Unit* target); + void SetAuraStack(uint32 spellId, Unit* target, uint32 stack); bool IsDamageToThreatSpell(SpellEntry const* spellInfo) const; void DeMorph(); void SendAttackStateUpdate(CalcDamageInfo *damageInfo); - void SendAttackStateUpdate(uint32 HitInfo, Unit *target, uint8 SwingType, SpellSchoolMask damageSchoolMask, uint32 Damage, uint32 AbsorbDamage, uint32 Resist, VictimState TargetState, uint32 BlockedAmount); + void SendAttackStateUpdate(uint32 HitInfo, Unit* target, uint8 SwingType, SpellSchoolMask damageSchoolMask, uint32 Damage, uint32 AbsorbDamage, uint32 Resist, VictimState TargetState, uint32 BlockedAmount); void SendSpellNonMeleeDamageLog(SpellNonMeleeDamage *log); - void SendSpellNonMeleeDamageLog(Unit *target, uint32 SpellID, uint32 Damage, SpellSchoolMask damageSchoolMask, uint32 AbsorbedDamage, uint32 Resist, bool PhysicalDamage, uint32 Blocked, bool CriticalHit = false); + void SendSpellNonMeleeDamageLog(Unit* target, uint32 SpellID, uint32 Damage, SpellSchoolMask damageSchoolMask, uint32 AbsorbedDamage, uint32 Resist, bool PhysicalDamage, uint32 Blocked, bool CriticalHit = false); void SendPeriodicAuraLog(SpellPeriodicAuraLogInfo *pInfo); - void SendSpellMiss(Unit *target, uint32 spellID, SpellMissInfo missInfo); - void SendSpellDamageImmune(Unit *target, uint32 spellId); + void SendSpellMiss(Unit* target, uint32 spellID, SpellMissInfo missInfo); + void SendSpellDamageImmune(Unit* target, uint32 spellId); void NearTeleportTo(float x, float y, float z, float orientation, bool casting = false); virtual bool SetPosition(float x, float y, float z, float ang, bool teleport = false); @@ -1508,7 +1508,7 @@ class Unit : public WorldObject void SetFacing(float ori, WorldObject* obj = NULL); void SendMonsterStop(bool on_death = false); void SendMonsterMove(float NewPosX, float NewPosY, float NewPosZ, uint32 Time, Player* player = NULL); - void SendMonsterMove(float NewPosX, float NewPosY, float NewPosZ, uint32 MoveFlags, uint32 time, float speedZ, Player *player = NULL); + void SendMonsterMove(float NewPosX, float NewPosY, float NewPosZ, uint32 MoveFlags, uint32 time, float speedZ, Player* player = NULL); void SendMonsterMoveExitVehicle(Position const* newPos); //void SendMonsterMove(float NewPosX, float NewPosY, float NewPosZ, uint8 type, uint32 MovementFlags, uint32 Time, Player* player = NULL); void SendMonsterMoveTransport(Unit *vehicleOwner); @@ -1907,7 +1907,7 @@ class Unit : public WorldObject uint32 BuildAuraStateUpdateForTarget(Unit* target) const; bool HasAuraState(AuraState flag, SpellEntry const *spellProto = NULL, Unit const* Caster = NULL) const ; void UnsummonAllTotems(); - Unit* SelectMagnetTarget(Unit *victim, SpellEntry const *spellInfo = NULL); + Unit* SelectMagnetTarget(Unit* victim, SpellEntry const *spellInfo = NULL); int32 SpellBaseDamageBonus(SpellSchoolMask schoolMask); int32 SpellBaseHealingBonus(SpellSchoolMask schoolMask); int32 SpellBaseDamageBonusForVictim(SpellSchoolMask schoolMask, Unit *pVictim); diff --git a/src/server/game/Groups/Group.h b/src/server/game/Groups/Group.h index 2d5d073fb07..b87d2212d46 100755 --- a/src/server/game/Groups/Group.h +++ b/src/server/game/Groups/Group.h @@ -186,11 +186,11 @@ class Group bool Create(Player *leader); void LoadGroupFromDB(Field *field); void LoadMemberFromDB(uint32 guidLow, uint8 memberFlags, uint8 subgroup, uint8 roles); - bool AddInvite(Player *player); - void RemoveInvite(Player *player); + bool AddInvite(Player* player); + void RemoveInvite(Player* player); void RemoveAllInvites(); - bool AddLeaderInvite(Player *player); - bool AddMember(Player *player); + bool AddLeaderInvite(Player* player); + bool AddMember(Player* player); bool RemoveMember(const uint64 &guid, const RemoveMethod &method = GROUP_REMOVEMETHOD_DEFAULT, uint64 kicker = 0, const char* reason = NULL); void ChangeLeader(const uint64 &guid); void SetLootMethod(LootMethod method); @@ -242,7 +242,7 @@ class Group GroupJoinBattlegroundResult CanJoinBattlegroundQueue(Battleground const* bgOrTemplate, BattlegroundQueueTypeId bgQueueTypeId, uint32 MinPlayerCount, uint32 MaxPlayerCount, bool isRated, uint32 arenaSlot); void ChangeMembersGroup(const uint64 &guid, const uint8 &group); - void ChangeMembersGroup(Player *player, const uint8 &group); + void ChangeMembersGroup(Player* player, const uint8 &group); void SetTargetIcon(uint8 id, uint64 whoGuid, uint64 targetGuid); void SetGroupMemberFlag(uint64 guid, const bool &apply, GroupMemberFlags flag); void RemoveUniqueGroupMemberFlag(GroupMemberFlags flag); @@ -302,7 +302,7 @@ class Group protected: bool _setMembersGroup(const uint64 &guid, const uint8 &group); - void _homebindIfInstance(Player *player); + void _homebindIfInstance(Player* player); void _initRaidSubGroupsCounter(); member_citerator _getMemberCSlot(uint64 Guid) const; diff --git a/src/server/game/Guilds/Guild.h b/src/server/game/Guilds/Guild.h index 97e484bb5ce..d3f425e5068 100755 --- a/src/server/game/Guilds/Guild.h +++ b/src/server/game/Guilds/Guild.h @@ -649,7 +649,7 @@ public: void BroadcastWorker(Do& _do, Player* except = NULL) { for (Members::iterator itr = m_members.begin(); itr != m_members.end(); ++itr) - if (Player *player = itr->second->FindPlayer()) + if (Player* player = itr->second->FindPlayer()) if (player != except) _do(player); } diff --git a/src/server/game/Instances/InstanceSaveMgr.h b/src/server/game/Instances/InstanceSaveMgr.h index 2d2aeb3d38f..7981cf39b7c 100755 --- a/src/server/game/Instances/InstanceSaveMgr.h +++ b/src/server/game/Instances/InstanceSaveMgr.h @@ -80,11 +80,11 @@ class InstanceSave /* online players bound to the instance (perm/solo) does not include the members of the group unless they have permanent saves */ - void AddPlayer(Player *player) { m_playerList.push_back(player); } - bool RemovePlayer(Player *player) { m_playerList.remove(player); return UnloadIfEmpty(); } + void AddPlayer(Player* player) { m_playerList.push_back(player); } + bool RemovePlayer(Player* player) { m_playerList.remove(player); return UnloadIfEmpty(); } /* all groups bound to the instance */ - void AddGroup(Group *group) { m_groupList.push_back(group); } - bool RemoveGroup(Group *group) { m_groupList.remove(group); return UnloadIfEmpty(); } + void AddGroup(Group* group) { m_groupList.push_back(group); } + bool RemoveGroup(Group* group) { m_groupList.remove(group); return UnloadIfEmpty(); } /* instances cannot be reset (except at the global reset time) if there are players permanently bound to it diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index 10935ee2b9a..4ce4f3ea357 100755 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -426,7 +426,7 @@ class Map : public GridRefManager<NGridType> template<class NOTIFIER> void VisitGrid(const float &x, const float &y, float radius, NOTIFIER ¬ifier); CreatureGroupHolderType CreatureGroupHolder; - void UpdateIteratorBack(Player *player); + void UpdateIteratorBack(Player* player); TempSummon* SummonCreature(uint32 entry, Position const& pos, SummonPropertiesEntry const* properties = NULL, uint32 duration = 0, Unit* summoner = NULL, uint32 spellId = 0, uint32 vehId = 0); Creature* GetCreature(uint64 guid); @@ -588,7 +588,7 @@ class InstanceMap : public Map bool Reset(uint8 method); uint32 GetScriptId() { return i_script_id; } InstanceScript* GetInstanceScript() { return i_data; } - void PermBindAllPlayers(Player *player); + void PermBindAllPlayers(Player* player); void UnloadAll(); bool CanEnter(Player* player); void SendResetWarnings(uint32 timeLeft) const; diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index 00c79ff272a..fb47282e9db 100755 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -928,15 +928,15 @@ class ScriptMgr public: /* PlayerScript */ - void OnPVPKill(Player *killer, Player *killed); - void OnCreatureKill(Player *killer, Creature *killed); - void OnPlayerKilledByCreature(Creature *killer, Player *killed); - void OnPlayerLevelChanged(Player *player, uint8 oldLevel); - void OnPlayerFreeTalentPointsChanged(Player *player, uint32 newPoints); - void OnPlayerTalentsReset(Player *player, bool no_cost); - void OnPlayerMoneyChanged(Player *player, int32& amount); - void OnGivePlayerXP(Player *player, uint32& amount, Unit *victim); - void OnPlayerReputationChange(Player *player, uint32 factionID, int32& standing, bool incremental); + void OnPVPKill(Player* killer, Player* killed); + void OnCreatureKill(Player* killer, Creature* killed); + void OnPlayerKilledByCreature(Creature* killer, Player* killed); + void OnPlayerLevelChanged(Player* player, uint8 oldLevel); + void OnPlayerFreeTalentPointsChanged(Player* player, uint32 newPoints); + void OnPlayerTalentsReset(Player* player, bool no_cost); + void OnPlayerMoneyChanged(Player* player, int32& amount); + void OnGivePlayerXP(Player* player, uint32& amount, Unit* victim); + void OnPlayerReputationChange(Player* player, uint32 factionID, int32& standing, bool incremental); void OnPlayerDuelRequest(Player* target, Player* challenger); void OnPlayerDuelStart(Player* player1, Player* player2); void OnPlayerDuelEnd(Player* winner, Player* loser, DuelCompleteType type); @@ -947,7 +947,7 @@ class ScriptMgr void OnPlayerChat(Player* player, uint32 type, uint32 lang, std::string& msg, Channel* channel); void OnPlayerEmote(Player* player, uint32 emote); void OnPlayerTextEmote(Player* player, uint32 text_emote, uint32 emoteNum, uint64 guid); - void OnPlayerSpellCast(Player* player, Spell *spell, bool skipCheck); + void OnPlayerSpellCast(Player* player, Spell* spell, bool skipCheck); void OnPlayerLogin(Player* player); void OnPlayerLogout(Player* player); void OnPlayerCreate(Player* player); @@ -955,12 +955,12 @@ class ScriptMgr void OnPlayerBindToInstance(Player* player, Difficulty difficulty, uint32 mapid, bool permanent); public: /* GuildScript */ - void OnGuildAddMember(Guild *guild, Player *player, uint8& plRank); - void OnGuildRemoveMember(Guild *guild, Player *player, bool isDisbanding, bool isKicked); - void OnGuildMOTDChanged(Guild *guild, const std::string& newMotd); - void OnGuildInfoChanged(Guild *guild, const std::string& newInfo); - void OnGuildCreate(Guild *guild, Player* leader, const std::string& name); - void OnGuildDisband(Guild *guild); + void OnGuildAddMember(Guild* guild, Player* player, uint8& plRank); + void OnGuildRemoveMember(Guild* guild, Player* player, bool isDisbanding, bool isKicked); + void OnGuildMOTDChanged(Guild* guild, const std::string& newMotd); + void OnGuildInfoChanged(Guild* guild, const std::string& newInfo); + void OnGuildCreate(Guild* guild, Player* leader, const std::string& name); + void OnGuildDisband(Guild* guild); void OnGuildMemberWitdrawMoney(Guild* guild, Player* player, uint32 &amount, bool isRepair); void OnGuildMemberDepositMoney(Guild* guild, Player* player, uint32 &amount); void OnGuildItemMove(Guild* guild, Player* player, Item* pItem, bool isSrcBank, uint8 srcContainer, uint8 srcSlotId, diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index f28c1de5430..96d3d4631e3 100755 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -318,7 +318,7 @@ class WorldSession void SendNotInArenaTeamPacket(uint8 type); void SendPetitionShowList(uint64 guid); - void BuildPartyMemberStatsChangedPacket(Player *player, WorldPacket *data); + void BuildPartyMemberStatsChangedPacket(Player* player, WorldPacket *data); void DoLootRelease(uint64 lguid); diff --git a/src/server/game/Spells/Auras/SpellAuras.h b/src/server/game/Spells/Auras/SpellAuras.h index ef23070b84f..61835d3980e 100755 --- a/src/server/game/Spells/Auras/SpellAuras.h +++ b/src/server/game/Spells/Auras/SpellAuras.h @@ -174,8 +174,8 @@ class Aura void SetNeedClientUpdateForTargets() const; void HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, bool apply, bool onReapply); - bool CanBeAppliedOn(Unit *target); - bool CheckAreaTarget(Unit *target); + bool CanBeAppliedOn(Unit* target); + bool CheckAreaTarget(Unit* target); // AuraScript void LoadScripts(); diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h index f3f666790c4..8b40ffe575a 100755 --- a/src/server/game/Spells/Spell.h +++ b/src/server/game/Spells/Spell.h @@ -170,7 +170,7 @@ class SpellCastTargets uint64 getUnitTargetGUID() const { return m_unitTargetGUID; } Unit *getUnitTarget() const { return m_unitTarget; } - void setUnitTarget(Unit *target); + void setUnitTarget(Unit* target); void setSrc(float x, float y, float z); void setSrc(Position &pos); void setSrc(WorldObject &wObj); @@ -765,7 +765,7 @@ namespace Trinity for (typename GridRefManager<T>::iterator itr = m.begin(); itr != m.end(); ++itr) { - Unit *target = (Unit*)itr->getSource(); + Unit* target = (Unit*)itr->getSource(); if (!i_source->canSeeOrDetect(target, true)) continue; diff --git a/src/server/game/Weather/Weather.h b/src/server/game/Weather/Weather.h index b89053e24e7..b3146ddafe6 100755 --- a/src/server/game/Weather/Weather.h +++ b/src/server/game/Weather/Weather.h @@ -71,8 +71,8 @@ class Weather bool ReGenerate(); bool UpdateWeather(); - void SendWeatherUpdateToPlayer(Player *player); - static void SendFineWeatherUpdateToPlayer(Player *player); + void SendWeatherUpdateToPlayer(Player* player); + static void SendFineWeatherUpdateToPlayer(Player* player); void SetWeather(WeatherType type, float grade); /// For which zone is this weather? |