Core/Misc: identation fixes
This commit is contained in:
@@ -12657,7 +12657,7 @@ Item* Player::EquipItem(uint16 pos, Item* pItem, bool update)
|
|||||||
UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_EQUIP_ITEM, pItem->GetEntry());
|
UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_EQUIP_ITEM, pItem->GetEntry());
|
||||||
UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_EQUIP_EPIC_ITEM, pItem->GetEntry(), slot);
|
UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_EQUIP_EPIC_ITEM, pItem->GetEntry(), slot);
|
||||||
|
|
||||||
sScriptMgr->OnEquip(this, pItem, bag, slot, update);
|
sScriptMgr->OnEquip(this, pItem, bag, slot, update);
|
||||||
return pItem;
|
return pItem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -169,9 +169,7 @@ 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()
|
sScriptMgr->OnPlayerJoinBG(_player, sBattlegroundMgr->GetBattlegroundTemplate(ginfo->BgTypeId));
|
||||||
ScriptMgr* sScriptMgr;
|
|
||||||
sScriptMgr->OnPlayerJoinBG(_player, sBattlegroundMgr->GetBattlegroundTemplate(ginfo->BgTypeId));
|
|
||||||
|
|
||||||
}
|
}
|
||||||
// check if group can queue:
|
// check if group can queue:
|
||||||
@@ -251,8 +249,7 @@ 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,8 +659,7 @@ 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:
|
||||||
else
|
else
|
||||||
@@ -759,8 +755,7 @@ 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()));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// pussywizard: schedule update for rated arena
|
// pussywizard: schedule update for rated arena
|
||||||
|
|||||||
@@ -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);
|
||||||
|
|||||||
@@ -790,16 +790,16 @@ class PlayerScript : public ScriptObject
|
|||||||
virtual void OnAfterSetVisibleItemSlot(Player* /*player*/, uint8 /*slot*/, Item* /*item*/) { }
|
virtual void OnAfterSetVisibleItemSlot(Player* /*player*/, uint8 /*slot*/, Item* /*item*/) { }
|
||||||
|
|
||||||
// After an item has been moved from inventory
|
// After an item has been moved from inventory
|
||||||
virtual void OnAfterMoveItemFromInventory(Player* /*player*/, Item* /*it*/, uint8 /*bag*/, uint8 /*slot*/, bool /*update*/) { }
|
virtual void OnAfterMoveItemFromInventory(Player* /*player*/, Item* /*it*/, uint8 /*bag*/, uint8 /*slot*/, bool /*update*/) { }
|
||||||
|
|
||||||
// After an item has been equipped
|
// After an item has been equipped
|
||||||
virtual void OnEquip(Player* /*player*/, Item* /*it*/, uint8 /*bag*/, uint8 /*slot*/, bool /*update*/) { }
|
virtual void OnEquip(Player* /*player*/, Item* /*it*/, uint8 /*bag*/, uint8 /*slot*/, bool /*update*/) { }
|
||||||
|
|
||||||
// After player enters queue for BG
|
// After player enters queue for BG
|
||||||
virtual void OnPlayerJoinBG(Player* player, Battleground* bg) { }
|
virtual void OnPlayerJoinBG(Player* player, Battleground* bg) { }
|
||||||
|
|
||||||
// After player enters queue for Arena
|
// After player enters queue for Arena
|
||||||
virtual void OnPlayerJoinArena(Player* player, Battleground* bg) { }
|
virtual void OnPlayerJoinArena(Player* player, Battleground* bg) { }
|
||||||
};
|
};
|
||||||
|
|
||||||
class GuildScript : public ScriptObject
|
class GuildScript : public ScriptObject
|
||||||
@@ -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
|
||||||
@@ -1101,9 +1098,9 @@ class ScriptMgr
|
|||||||
void OnPlayerBeingCharmed(Player* player, Unit* charmer, uint32 oldFactionId, uint32 newFactionId);
|
void OnPlayerBeingCharmed(Player* player, Unit* charmer, uint32 oldFactionId, uint32 newFactionId);
|
||||||
void OnAfterPlayerSetVisibleItemSlot(Player* player, uint8 slot, Item *item);
|
void OnAfterPlayerSetVisibleItemSlot(Player* player, uint8 slot, Item *item);
|
||||||
void OnAfterPlayerMoveItemFromInventory(Player* player, Item* it, uint8 bag, uint8 slot, bool update);
|
void OnAfterPlayerMoveItemFromInventory(Player* player, Item* it, uint8 bag, uint8 slot, bool update);
|
||||||
void OnEquip(Player* player, Item* it, uint8 bag, uint8 slot, bool update);
|
void OnEquip(Player* player, Item* it, uint8 bag, uint8 slot, bool update);
|
||||||
void OnPlayerJoinBG(Player* player, Battleground* bg);
|
void OnPlayerJoinBG(Player* player, Battleground* bg);
|
||||||
void OnPlayerJoinArena(Player* player, Battleground* bg);
|
void OnPlayerJoinArena(Player* player, Battleground* bg);
|
||||||
|
|
||||||
public: /* GuildScript */
|
public: /* GuildScript */
|
||||||
|
|
||||||
@@ -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);
|
||||||
|
|||||||
Reference in New Issue
Block a user