diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-06-24 00:00:58 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-06-24 00:00:58 +0200 |
| commit | 1ed38faeac836c85efcd9574939939ae861c24e8 (patch) | |
| tree | 712814ba3ac9c61d81137638f3fd8aaf2e2aa4ba /src | |
| parent | 42c497d8e0174226053e6c31e87de8e36d56ccae (diff) | |
Core: Fix merge fail
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Scripting/ScriptMgr.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index b8cea691ff8..00060bea90c 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -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 |