Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-25 19:31:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Misc: Fixed warnings

Browse Source
This commit is contained in:
Shauren
2014-06-24 02:01:40 +02:00
parent 98cce05185
commit 05ea2f76b8
4 changed files with 30 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/server/game/Scripting/ScriptMgr.h
View File

@@ -781,22 +781,22 @@ class AccountScript : public ScriptObject
public:
// Called when an account logged in succesfully
virtual void OnAccountLogin(uint32 accountId) {}
virtual void OnAccountLogin(uint32 /*accountId*/) {}
// Called when an account login failed
virtual void OnFailedAccountLogin(uint32 accountId) {}
virtual void OnFailedAccountLogin(uint32 /*accountId*/) {}
// Called when Email is successfully changed for Account
virtual void OnEmailChange(uint32 accountId) {}
virtual void OnEmailChange(uint32 /*accountId*/) {}
// Called when Email failed to change for Account
virtual void OnFailedEmailChange(uint32 accountId) {}
virtual void OnFailedEmailChange(uint32 /*accountId*/) {}
// Called when Password is successfully changed for Account
virtual void OnPasswordChange(uint32 accountId) {}
virtual void OnPasswordChange(uint32 /*accountId*/) {}
// Called when Password failed to change for Account
virtual void OnFailedPasswordChange(uint32 accountId) {}
virtual void OnFailedPasswordChange(uint32 /*accountId*/) {}
};
class GuildScript : public ScriptObject

30
src/server/game/Spells/Auras/SpellAuras.cpp
View File

@@ -694,21 +694,12 @@ void Aura::Update(uint32 diff, Unit* caster)
if (int32(caster->GetHealth()) > manaPerSecond)
caster->ModifyHealth(-manaPerSecond);
else
{
Remove();
return;
}
}
else if (int32(caster->GetPower(powertype)) >= manaPerSecond)
caster->ModifyPower(powertype, -manaPerSecond);
else
{
if (int32(caster->GetPower(powertype)) >= manaPerSecond)
caster->ModifyPower(powertype, -manaPerSecond);
else
{
Remove();
return;
}
}
Remove();
}
}
}
@@ -734,17 +725,17 @@ int32 Aura::CalcMaxDuration(Unit* caster) const
// IsPermanent() checks max duration (which we are supposed to calculate here)
if (maxDuration != -1 && modOwner)
modOwner->ApplySpellMod(GetId(), SPELLMOD_DURATION, maxDuration);
return maxDuration;
}
void Aura::SetDuration(int32 duration, bool withMods)
{
if (withMods)
{
if (Unit* caster = GetCaster())
if (Player* modOwner = caster->GetSpellModOwner())
modOwner->ApplySpellMod(GetId(), SPELLMOD_DURATION, duration);
}
m_duration = duration;
SetNeedClientUpdateForTargets();
}
@@ -782,6 +773,7 @@ void Aura::SetCharges(uint8 charges)
{
if (m_procCharges == charges)
return;
m_procCharges = charges;
m_isUsingCharges = m_procCharges != 0;
SetNeedClientUpdateForTargets();
@@ -796,6 +788,7 @@ uint8 Aura::CalcMaxCharges(Unit* caster) const
if (caster)
if (Player* modOwner = caster->GetSpellModOwner())
modOwner->ApplySpellMod(GetId(), SPELLMOD_CHARGES, maxProcCharges);
return maxProcCharges;
}
@@ -818,6 +811,7 @@ bool Aura::ModCharges(int32 num, AuraRemoveMode removeMode)
SetCharges(charges);
}
return false;
}
@@ -886,6 +880,7 @@ bool Aura::ModStackAmount(int32 num, AuraRemoveMode removeMode)
if (SpellModifier* mod = aurEff->GetSpellModifier())
mod->charges = GetCharges();
}
SetNeedClientUpdateForTargets();
return false;
}
@@ -901,10 +896,8 @@ bool Aura::HasMoreThanOneEffectForType(AuraType auraType) const
{
uint32 count = 0;
for (uint32 i = 0; i < MAX_SPELL_EFFECTS; ++i)
{
if (HasEffect(i) && GetSpellInfo()->Effects[i].ApplyAuraName == auraType)
if (HasEffect(i) && AuraType(GetSpellInfo()->Effects[i].ApplyAuraName) == auraType)
++count;
}
return count > 1;
}
@@ -912,10 +905,9 @@ bool Aura::HasMoreThanOneEffectForType(AuraType auraType) const
bool Aura::IsArea() const
{
for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
{
if (HasEffect(i) && GetSpellInfo()->Effects[i].IsAreaAuraEffect())
return true;
}
return false;
}

24
src/server/scripts/World/action_ip_logger.cpp
View File

@@ -49,39 +49,39 @@ class AccountActionIpLogger : public AccountScript
// We log last_ip instead of last_attempt_ip, as login was successful
// ACCOUNT_LOGIN = 0
void OnAccountLogin(uint32 accountId)
void OnAccountLogin(uint32 accountId) override
{
AccountIPLogAction(accountId, ACCOUNT_LOGIN);
}
// We log last_attempt_ip instead of last_ip, as failed login doesn't necessarily mean approperiate user
// ACCOUNT_FAIL_LOGIN = 1
void OnFailedAccountLogin(uint32 accountId)
void OnFailedAccountLogin(uint32 accountId) override
{
AccountIPLogAction(accountId, ACCOUNT_FAIL_LOGIN);
}
// ACCOUNT_CHANGE_PW = 2
void OnPasswordChange(uint32 accountId)
void OnPasswordChange(uint32 accountId) override
{
AccountIPLogAction(accountId, ACCOUNT_CHANGE_PW);
}
// ACCOUNT_CHANGE_PW_FAIL = 3
void OnFailedPasswordChange(uint32 accountId)
void OnFailedPasswordChange(uint32 accountId) override
{
AccountIPLogAction(accountId, ACCOUNT_CHANGE_PW_FAIL);
}
// Registration Email can NOT be changed apart from GM level users. Thus, we do not require to log them...
// ACCOUNT_CHANGE_EMAIL = 4
void OnEmailChange(uint32 accountId)
// ACCOUNT_CHANGE_EMAIL = 4
void OnEmailChange(uint32 accountId) override
{
AccountIPLogAction(accountId, ACCOUNT_CHANGE_EMAIL); // ... they get logged by gm command logger anyway
}
// ACCOUNT_CHANGE_EMAIL_FAIL = 5
void OnFailedEmailChange(uint32 accountId)
void OnFailedEmailChange(uint32 accountId) override
{
AccountIPLogAction(accountId, ACCOUNT_CHANGE_EMAIL_FAIL);
}
@@ -168,19 +168,19 @@ class CharacterActionIpLogger : public PlayerScript
CharacterActionIpLogger() : PlayerScript("CharacterActionIpLogger") { }
// CHARACTER_CREATE = 7
void OnCreate(Player* player)
void OnCreate(Player* player) override
{
CharacterIPLogAction(player, CHARACTER_CREATE);
}
// CHARACTER_LOGIN = 8
void OnLogin(Player* player)
void OnLogin(Player* player, bool /*firstLogin*/) override
{
CharacterIPLogAction(player, CHARACTER_LOGIN);
}
// CHARACTER_LOGOUT = 9
void OnLogout(Player* player)
void OnLogout(Player* player) override
{
CharacterIPLogAction(player, CHARACTER_LOGOUT);
}
@@ -252,13 +252,13 @@ public:
CharacterDeleteActionIpLogger() : PlayerScript("CharacterDeleteActionIpLogger") { }
// CHARACTER_DELETE = 10
void OnDelete(uint64 guid, uint32 accountId)
void OnDelete(uint64 guid, uint32 accountId) override
{
DeleteIPLogAction(guid, accountId, CHARACTER_DELETE);
}
// CHARACTER_FAILED_DELETE = 11
void OnFailedDelete(uint64 guid, uint32 accountId)
void OnFailedDelete(uint64 guid, uint32 accountId) override
{
DeleteIPLogAction(guid, accountId, CHARACTER_FAILED_DELETE);
}

2
src/server/shared/Debugging/WheatyExceptionReport.cpp
View File

@@ -877,7 +877,7 @@ unsigned nestingLevel,
DWORD_PTR offset,
bool & bHandled,
const char* Name,
char* suffix,
char* /*suffix*/,
bool newSymbol,
bool logChildren)
{