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

Conflicts:
	src/server/game/Accounts/AccountMgr.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/World/World.cpp
This commit is contained in:
Vincent-Michael committed 2014-06-23 23:47:48 +02:00
commit d8234bed42
65 files changed
+4489 -67

No files matched your search

+43 -2
View File
@@ -29,6 +29,7 @@
#include "World.h"
#include "Weather.h"
class AccountMgr;
class AuctionHouseObject;
class AuraScript;
class Battleground;
@@ -752,7 +753,10 @@ class PlayerScript : public UnitScript
virtual void OnCreate(Player* /*player*/) { }
// Called when a player is deleted.
virtual void OnDelete(uint64 /*guid*/) { }
virtual void OnDelete(uint64 /*guid*/, uint32 /*accountId*/) { }
// Called when a player delete failed
virtual void OnFailedDelete(uint64 /*guid*/, uint32 /*accountId*/) { }
// Called when a player is about to be saved.
virtual void OnSave(Player* /*player*/) { }
@@ -767,6 +771,33 @@ class PlayerScript : public UnitScript
virtual void OnMapChanged(Player* /*player*/) { }
};
class AccountScript : public ScriptObject
{
protected:
AccountScript(const char* name);
public:
// Called when an account logged in succesfully
virtual void OnAccountLogin(uint32 /*accountI*/d) {}
// Called when an account login failed
virtual void OnFailedAccountLogin(uint32 /*accountI*/) {}
// Called when Email is successfully changed for Account
virtual void OnEmailChange(uint32 /*accountI*/) {}
// Called when Email failed to change for Account
virtual void OnFailedEmailChange(uint32 /*accountI*/) {}
// Called when Password is successfully changed for Account
virtual void OnPasswordChange(uint32 /*accountI*/) {}
// Called when Password failed to change for Account
virtual void OnFailedPasswordChange(uint32 /*accountI*/) {}
};
class GuildScript : public ScriptObject
{
protected:
@@ -1036,11 +1067,21 @@ class ScriptMgr
void OnPlayerLogin(Player* player, bool firstLogin);
void OnPlayerLogout(Player* player);
void OnPlayerCreate(Player* player);
void OnPlayerDelete(uint64 guid);
void OnPlayerDelete(uint64 guid, uint32 accountId);
void OnPlayerFailedDelete(uint64 guid, uint32 accountId);
void OnPlayerSave(Player* player);
void OnPlayerBindToInstance(Player* player, Difficulty difficulty, uint32 mapid, bool permanent);
void OnPlayerUpdateZone(Player* player, uint32 newZone, uint32 newArea);
public: /* AccountScript */
void OnAccountLogin(uint32 accountId);
void OnFailedAccountLogin(uint32 accountId);
void OnEmailChange(uint32 accountId);
void OnFailedEmailChange(uint32 accountId);
void OnPasswordChange(uint32 accountId);
void OnFailedPasswordChange(uint32 accountId);
public: /* GuildScript */
void OnGuildAddMember(Guild* guild, Player* player, uint8& plRank);