Merge pull request #930 from Winfidonarleyan/fix_typo

Fix typo in hooks for BGScripts
This commit is contained in:
Kaev
2018-06-18 18:53:12 +02:00
committed by GitHub
3 changed files with 20 additions and 20 deletions

View File

@@ -282,7 +282,7 @@ void Battleground::Update(uint32 diff)
PostUpdateImpl(diff);
sScriptMgr->OnBattlegroudUpdate(this, diff);
sScriptMgr->OnBattlegroundUpdate(this, diff);
}
inline void Battleground::_CheckSafePositions(uint32 diff)
@@ -584,7 +584,7 @@ inline void Battleground::_ProcessJoin(uint32 diff)
if (sWorld->getBoolConfig(CONFIG_BATTLEGROUND_QUEUE_ANNOUNCER_ENABLE))
sWorld->SendWorldText(LANG_BG_STARTED_ANNOUNCE_WORLD, GetName(), std::min(GetMinLevel(), (uint32)80), std::min(GetMaxLevel(), (uint32)80));
sScriptMgr->OnBattlegroudStart(this);
sScriptMgr->OnBattlegroundStart(this);
}
}
}
@@ -978,7 +978,7 @@ void Battleground::EndBattleground(TeamId winnerTeamId)
uint32 loser_kills = player->GetRandomWinner() ? BG_REWARD_LOSER_HONOR_LAST : BG_REWARD_LOSER_HONOR_FIRST;
uint32 winner_arena = player->GetRandomWinner() ? BG_REWARD_WINNER_ARENA_LAST : BG_REWARD_WINNER_ARENA_FIRST;
sScriptMgr->OnBattlegroudEndReward(this, player, winnerTeamId);
sScriptMgr->OnBattlegroundEndReward(this, player, winnerTeamId);
// Reward winner team
if (bgTeamId == winnerTeamId)
@@ -1259,7 +1259,7 @@ void Battleground::AddPlayer(Player* player)
PlayerAddedToBGCheckIfBGIsRunning(player);
AddOrSetPlayerToCorrectBgGroup(player, teamId);
sScriptMgr->OnBattlegroudAddPlayer(this, player);
sScriptMgr->OnBattlegroundAddPlayer(this, player);
// Log
#if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS)

View File

@@ -1964,24 +1964,24 @@ void ScriptMgr::OnAfterArenaRatingCalculation(Battleground *const bg, int32 &win
}
// BGScript
void ScriptMgr::OnBattlegroudStart(Battleground* bg)
void ScriptMgr::OnBattlegroundStart(Battleground* bg)
{
FOREACH_SCRIPT(BGScript)->OnBattlegroudStart(bg);
FOREACH_SCRIPT(BGScript)->OnBattlegroundStart(bg);
}
void ScriptMgr::OnBattlegroudEndReward(Battleground* bg, Player* player, TeamId winnerTeamId)
void ScriptMgr::OnBattlegroundEndReward(Battleground* bg, Player* player, TeamId winnerTeamId)
{
FOREACH_SCRIPT(BGScript)->OnBattlegroudEndReward(bg, player, winnerTeamId);
FOREACH_SCRIPT(BGScript)->OnBattlegroundEndReward(bg, player, winnerTeamId);
}
void ScriptMgr::OnBattlegroudUpdate(Battleground* bg, uint32 diff)
void ScriptMgr::OnBattlegroundUpdate(Battleground* bg, uint32 diff)
{
FOREACH_SCRIPT(BGScript)->OnBattlegroudUpdate(bg, diff);
FOREACH_SCRIPT(BGScript)->OnBattlegroundUpdate(bg, diff);
}
void ScriptMgr::OnBattlegroudAddPlayer(Battleground* bg, Player* player)
void ScriptMgr::OnBattlegroundAddPlayer(Battleground* bg, Player* player)
{
FOREACH_SCRIPT(BGScript)->OnBattlegroudAddPlayer(bg, player);
FOREACH_SCRIPT(BGScript)->OnBattlegroundAddPlayer(bg, player);
}
AllMapScript::AllMapScript(const char* name)

View File

@@ -1048,16 +1048,16 @@ public:
bool IsDatabaseBound() const { return false; }
// Start Battlegroud
virtual void OnBattlegroudStart(Battleground* /*bg*/) { }
virtual void OnBattlegroundStart(Battleground* /*bg*/) { }
// End Battleground
virtual void OnBattlegroudEndReward(Battleground* /*bg*/, Player* /*player*/, TeamId /*winnerTeamId*/) { }
virtual void OnBattlegroundEndReward(Battleground* /*bg*/, Player* /*player*/, TeamId /*winnerTeamId*/) { }
// Update Battlegroud
virtual void OnBattlegroudUpdate(Battleground* /*bg*/, uint32 /*diff*/) { }
virtual void OnBattlegroundUpdate(Battleground* /*bg*/, uint32 /*diff*/) { }
// Add Player in Battlegroud
virtual void OnBattlegroudAddPlayer(Battleground* /*bg*/, Player* /*player*/) { }
virtual void OnBattlegroundAddPlayer(Battleground* /*bg*/, Player* /*player*/) { }
};
// this class can be used to be extended by Modules
@@ -1381,10 +1381,10 @@ class ScriptMgr
public: /* BGScript */
void OnBattlegroudStart(Battleground* bg);
void OnBattlegroudEndReward(Battleground* bg, Player* player, TeamId winnerTeamId);
void OnBattlegroudUpdate(Battleground* bg, uint32 diff);
void OnBattlegroudAddPlayer(Battleground* bg, Player* player);
void OnBattlegroundStart(Battleground* bg);
void OnBattlegroundEndReward(Battleground* bg, Player* player, TeamId winnerTeamId);
void OnBattlegroundUpdate(Battleground* bg, uint32 diff);
void OnBattlegroundAddPlayer(Battleground* bg, Player* player);
private: