sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Core/Misc: identation fixes

Browse Source
This commit is contained in:
moob0
2016-11-22 22:32:50 +01:00
committed by Shin
parent bb429b22cf
commit a9ca43310e
4 changed files with 15 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Handlers/BattleGroundHandler.cpp
-5
View File
@@ -169,8 +169,6 @@ void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket & recvData)
sBattlegroundMgr->BuildBattlegroundStatusPacket(&data, bgt, queueSlot, STATUS_WAIT_QUEUE, avgWaitTime, 0, 0, TEAM_NEUTRAL); sBattlegroundMgr->BuildBattlegroundStatusPacket(&data, bgt, queueSlot, STATUS_WAIT_QUEUE, avgWaitTime, 0, 0, TEAM_NEUTRAL);
SendPacket(&data); SendPacket(&data);
//#define sScriptMgr ACE_Singleton<ScriptMgr, ACE_Null_Mutex>::instance()
ScriptMgr* sScriptMgr;
sScriptMgr->OnPlayerJoinBG(_player, sBattlegroundMgr->GetBattlegroundTemplate(ginfo->BgTypeId)); sScriptMgr->OnPlayerJoinBG(_player, sBattlegroundMgr->GetBattlegroundTemplate(ginfo->BgTypeId));
} }
@@ -251,7 +249,6 @@ void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket & recvData)
sBattlegroundMgr->BuildGroupJoinedBattlegroundPacket(&data, err); sBattlegroundMgr->BuildGroupJoinedBattlegroundPacket(&data, err);
member->GetSession()->SendPacket(&data); member->GetSession()->SendPacket(&data);
ScriptMgr* sScriptMgr;
sScriptMgr->OnPlayerJoinBG(member, sBattlegroundMgr->GetBattlegroundTemplate(member->GetBattlegroundTypeId())); sScriptMgr->OnPlayerJoinBG(member, sBattlegroundMgr->GetBattlegroundTemplate(member->GetBattlegroundTypeId()));
} }
} }
@@ -662,7 +659,6 @@ void WorldSession::HandleBattlemasterJoinArena(WorldPacket & recvData)
sBattlegroundMgr->BuildBattlegroundStatusPacket(&data, bgt, queueSlot, STATUS_WAIT_QUEUE, avgWaitTime, 0, arenatype, TEAM_NEUTRAL); sBattlegroundMgr->BuildBattlegroundStatusPacket(&data, bgt, queueSlot, STATUS_WAIT_QUEUE, avgWaitTime, 0, arenatype, TEAM_NEUTRAL);
SendPacket(&data); SendPacket(&data);
ScriptMgr* sScriptMgr;
sScriptMgr->OnPlayerJoinArena(_player, sBattlegroundMgr->GetBattlegroundTemplate(ginfo->BgTypeId)); sScriptMgr->OnPlayerJoinArena(_player, sBattlegroundMgr->GetBattlegroundTemplate(ginfo->BgTypeId));
} }
// check if group can queue: // check if group can queue:
@@ -759,7 +755,6 @@ void WorldSession::HandleBattlemasterJoinArena(WorldPacket & recvData)
sBattlegroundMgr->BuildGroupJoinedBattlegroundPacket(&data, err); sBattlegroundMgr->BuildGroupJoinedBattlegroundPacket(&data, err);
member->GetSession()->SendPacket(&data); member->GetSession()->SendPacket(&data);
ScriptMgr* sScriptMgr;
sScriptMgr->OnPlayerJoinArena(member, sBattlegroundMgr->GetBattlegroundTemplate(member->GetBattlegroundTypeId())); sScriptMgr->OnPlayerJoinArena(member, sBattlegroundMgr->GetBattlegroundTemplate(member->GetBattlegroundTypeId()));
} }
src/game/Scripting/ScriptMgr.cpp
-6
View File
@@ -1437,12 +1437,6 @@ void ScriptMgr::OnGroupDisband(Group* group)
FOREACH_SCRIPT(GroupScript)->OnDisband(group); FOREACH_SCRIPT(GroupScript)->OnDisband(group);
} }
/*void ScriptMgr::OnGroupJoinBG(Group* group, Battleground* bg)
{
ASSERT(group);
FOREACH_SCRIPT(GroupScript)->OnGroupJoinBG(group, bg);
}*/
void ScriptMgr::OnGlobalItemDelFromDB(SQLTransaction& trans, uint32 itemGuid) void ScriptMgr::OnGlobalItemDelFromDB(SQLTransaction& trans, uint32 itemGuid)
{ {
ASSERT(trans); ASSERT(trans);
src/game/Scripting/ScriptMgr.h
-4
View File
@@ -869,9 +869,6 @@ class GroupScript : public ScriptObject
// Called when a group is disbanded. // Called when a group is disbanded.
virtual void OnDisband(Group* /*group*/) { } virtual void OnDisband(Group* /*group*/) { }
// After group enters queue for BG or Arena
//virtual void OnGroupJoinBG(Group* group, Battleground* bg) { }
}; };
// following hooks can be used anywhere and are not db bounded // following hooks can be used anywhere and are not db bounded
@@ -1127,7 +1124,6 @@ class ScriptMgr
void OnGroupRemoveMember(Group* group, uint64 guid, RemoveMethod method, uint64 kicker, const char* reason); void OnGroupRemoveMember(Group* group, uint64 guid, RemoveMethod method, uint64 kicker, const char* reason);
void OnGroupChangeLeader(Group* group, uint64 newLeaderGuid, uint64 oldLeaderGuid); void OnGroupChangeLeader(Group* group, uint64 newLeaderGuid, uint64 oldLeaderGuid);
void OnGroupDisband(Group* group); void OnGroupDisband(Group* group);
//void OnGroupJoinBG(Group* group, Battleground* bg);
public: /* GlobalScript */ public: /* GlobalScript */
void OnGlobalItemDelFromDB(SQLTransaction& trans, uint32 itemGuid); void OnGlobalItemDelFromDB(SQLTransaction& trans, uint32 itemGuid);