Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/Scripting/ScriptMgr.h
This commit is contained in:
commit
c0c708cf02
5 files changed
+139
-4
No files matched your search
@@ -705,6 +705,9 @@ class PlayerScript : public UnitScript
|
||||
// Called when a player's money is modified (before the modification is done)
|
||||
virtual void OnMoneyChanged(Player* /*player*/, int64& /*amount*/) { }
|
||||
|
||||
// Called when a player's money is at limit (amount = money tried to add)
|
||||
virtual void OnMoneyLimit(Player* /*player*/, int64 /*amount*/) { }
|
||||
|
||||
// Called when a player gains XP (before anything is given)
|
||||
virtual void OnGiveXP(Player* /*player*/, uint32& /*amount*/, Unit* /*victim*/) { }
|
||||
|
||||
@@ -1052,6 +1055,7 @@ class ScriptMgr
|
||||
void OnPlayerFreeTalentPointsChanged(Player* player, uint32 newPoints);
|
||||
void OnPlayerTalentsReset(Player* player, bool noCost);
|
||||
void OnPlayerMoneyChanged(Player* player, int64& amount);
|
||||
void OnPlayerMoneyLimit(Player* player, int64 amount);
|
||||
void OnGivePlayerXP(Player* player, uint32& amount, Unit* victim);
|
||||
void OnPlayerReputationChange(Player* player, uint32 factionID, int32& standing, bool incremental);
|
||||
void OnPlayerDuelRequest(Player* target, Player* challenger);
|
||||
|
||||
Reference in new issue
Block a user