diff options
-rwxr-xr-x | src/server/game/Chat/Channels/Channel.cpp | 1 | ||||
-rwxr-xr-x | src/server/game/Conditions/ConditionMgr.h | 8 | ||||
-rwxr-xr-x | src/server/game/DataStores/DBCStructure.h | 2 | ||||
-rw-r--r-- | src/server/game/DungeonFinding/LFGScripts.cpp | 2 | ||||
-rw-r--r-- | src/server/game/DungeonFinding/LFGScripts.h | 2 | ||||
-rwxr-xr-x | src/server/game/Scripting/ScriptMgr.h | 2 |
6 files changed, 8 insertions, 9 deletions
diff --git a/src/server/game/Chat/Channels/Channel.cpp b/src/server/game/Chat/Channels/Channel.cpp index 9cf8ee29b08..413070ca1de 100755 --- a/src/server/game/Chat/Channels/Channel.cpp +++ b/src/server/game/Chat/Channels/Channel.cpp @@ -1068,4 +1068,3 @@ void Channel::LeaveNotify(uint64 guid) else SendToAll(&data); } - diff --git a/src/server/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h index 406ae5d88b2..2aec58db48c 100755 --- a/src/server/game/Conditions/ConditionMgr.h +++ b/src/server/game/Conditions/ConditionMgr.h @@ -133,11 +133,11 @@ struct Condition }; typedef std::list<Condition*> ConditionList; -typedef std::map<uint32, ConditionList > ConditionTypeMap; -typedef std::map<ConditionSourceType, ConditionTypeMap > ConditionMap; -typedef std::map<uint32, ConditionTypeMap > VehicleSpellConditionMap; +typedef std::map<uint32, ConditionList> ConditionTypeMap; +typedef std::map<ConditionSourceType, ConditionTypeMap> ConditionMap; +typedef std::map<uint32, ConditionTypeMap> VehicleSpellConditionMap; -typedef std::map<uint32, ConditionList > ConditionReferenceMap;//only used for references +typedef std::map<uint32, ConditionList> ConditionReferenceMap;//only used for references class ConditionMgr { diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h index 431e803fa87..2c7bfb3eb1d 100755 --- a/src/server/game/DataStores/DBCStructure.h +++ b/src/server/game/DataStores/DBCStructure.h @@ -874,7 +874,7 @@ struct FactionEntry // helpers bool CanHaveReputation() const { - return reputationListID >=0; + return reputationListID >= 0; } }; diff --git a/src/server/game/DungeonFinding/LFGScripts.cpp b/src/server/game/DungeonFinding/LFGScripts.cpp index c3c6cd86548..23eb10a98ae 100644 --- a/src/server/game/DungeonFinding/LFGScripts.cpp +++ b/src/server/game/DungeonFinding/LFGScripts.cpp @@ -55,7 +55,7 @@ void LFGScripts::OnAddMember(Group* group, uint64 guid) sLFGMgr->Leave(plr); } -void LFGScripts::OnRemoveMember(Group* group, uint64 guid, RemoveMethod& method, uint64 kicker, const char* reason) +void LFGScripts::OnRemoveMember(Group* group, uint64 guid, RemoveMethod method, uint64 kicker, const char* reason) { uint64 gguid = group->GetGUID(); if (!gguid || method == GROUP_REMOVEMETHOD_DEFAULT) diff --git a/src/server/game/DungeonFinding/LFGScripts.h b/src/server/game/DungeonFinding/LFGScripts.h index 0547a3fad34..9a2d358188f 100644 --- a/src/server/game/DungeonFinding/LFGScripts.h +++ b/src/server/game/DungeonFinding/LFGScripts.h @@ -33,7 +33,7 @@ class LFGScripts: public GroupScript, public PlayerScript // Group Hooks void OnAddMember(Group* group, uint64 guid); - void OnRemoveMember(Group* group, uint64 guid, RemoveMethod& method, uint64 kicker, const char* reason); + void OnRemoveMember(Group* group, uint64 guid, RemoveMethod method, uint64 kicker, const char* reason); void OnDisband(Group* group); void OnChangeLeader(Group* group, uint64 newLeaderGuid, uint64 oldLeaderGuid); void OnInviteMember(Group* group, uint64 guid); diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index 61d24c949e6..5925992a3c2 100755 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -785,7 +785,7 @@ class GroupScript : public ScriptObject virtual void OnInviteMember(Group* /*group*/, uint64 /*guid*/) { } // Called when a member is removed from a group. - virtual void OnRemoveMember(Group* /*group*/, uint64 /*guid*/, RemoveMethod& /*method*/, uint64 /*kicker*/, const char* /*reason*/) { } + virtual void OnRemoveMember(Group* /*group*/, uint64 /*guid*/, RemoveMethod /*method*/, uint64 /*kicker*/, const char* /*reason*/) { } // Called when the leader of a group is changed. virtual void OnChangeLeader(Group* /*group*/, uint64 /*newLeaderGuid*/, uint64 /*oldLeaderGuid*/) { } |