Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/game/Scripting/ScriptMgr.h
This commit is contained in:
Vincent-Michael committed 2014-08-27 23:06:40 +02:00
commit c0c708cf02
5 files changed
+139 -4

No files matched your search

+5
View File
@@ -1180,6 +1180,11 @@ void ScriptMgr::OnPlayerMoneyChanged(Player* player, int64& amount)
FOREACH_SCRIPT(PlayerScript)->OnMoneyChanged(player, amount);
}
void ScriptMgr::OnPlayerMoneyLimit(Player* player, int64 amount)
{
FOREACH_SCRIPT(PlayerScript)->OnMoneyLimit(player, amount);
}
void ScriptMgr::OnGivePlayerXP(Player* player, uint32& amount, Unit* victim)
{
FOREACH_SCRIPT(PlayerScript)->OnGiveXP(player, amount, victim);