Core: Fix merge fail

This commit is contained in:
Vincent-Michael committed 2014-06-24 00:00:58 +02:00
1 parent 42c497d8e0
commit 1ed38faeac
1 file changed
+6 -6
+6 -6
View File
@@ -780,22 +780,22 @@ class AccountScript : public ScriptObject
public:
// Called when an account logged in succesfully
virtual void OnAccountLogin(uint32 /*accountI*/d) {}
virtual void OnAccountLogin(uint32 /*accountId*/) {}
// Called when an account login failed
virtual void OnFailedAccountLogin(uint32 /*accountI*/) {}
virtual void OnFailedAccountLogin(uint32 /*accountId*/) {}
// Called when Email is successfully changed for Account
virtual void OnEmailChange(uint32 /*accountI*/) {}
virtual void OnEmailChange(uint32 /*accountId*/) {}
// Called when Email failed to change for Account
virtual void OnFailedEmailChange(uint32 /*accountI*/) {}
virtual void OnFailedEmailChange(uint32 /*accountId*/) {}
// Called when Password is successfully changed for Account
virtual void OnPasswordChange(uint32 /*accountI*/) {}
virtual void OnPasswordChange(uint32 /*accountId*/) {}
// Called when Password failed to change for Account
virtual void OnFailedPasswordChange(uint32 /*accountI*/) {}
virtual void OnFailedPasswordChange(uint32 /*accountId*/) {}
};
class GuildScript : public ScriptObject