mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 07:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[7272] Trailing whitespace cleaning

Browse source 
The "please use git diff --check before commit" thing.

Signed-off-by: freghar <compmancz@gmail.com>
This commit is contained in:
freghar 2009-02-12 15:13:07 +01:00
parent d952b7ebcf
commit f04ec2b98b
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/ItemHandler.cpp
View file

@ -1161,7 +1161,7 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recv_data)
if(i!=0 && !itemProto->Socket[i-1].Color && (i+1 >= MAX_GEM_SOCKETS || itemProto->Socket[i+1].Color)) if(i!=0 && !itemProto->Socket[i-1].Color && (i+1 >= MAX_GEM_SOCKETS || itemProto->Socket[i+1].Color))
return; return;
// ok, this is first not colored socket for item with prismatic socket // ok, this is first not colored socket for item with prismatic socket
} }
// tried to put normal gem in meta socket // tried to put normal gem in meta socket

2
src/game/Spell.cpp
View file

@ -2378,7 +2378,7 @@ void Spell::handle_immediate()
int32 duration = GetSpellDuration(m_spellInfo); int32 duration = GetSpellDuration(m_spellInfo);
if (duration) if (duration)
{ {
// Apply duration mod // Apply duration mod
if(Player* modOwner = m_caster->GetSpellModOwner()) if(Player* modOwner = m_caster->GetSpellModOwner())
modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_DURATION, duration); modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_DURATION, duration);
m_spellState = SPELL_STATE_CASTING; m_spellState = SPELL_STATE_CASTING;

8
src/game/SpellAuras.cpp
View file

@ -424,9 +424,9 @@ m_updated(false), m_isRemovedOnShapeLost(true), m_in_use(false)
if(modOwner) if(modOwner)
modOwner->ApplySpellMod(GetId(), SPELLMOD_CHARGES, m_procCharges); modOwner->ApplySpellMod(GetId(), SPELLMOD_CHARGES, m_procCharges);
m_isRemovedOnShapeLost = (m_caster_guid==m_target->GetGUID() && m_isRemovedOnShapeLost = (m_caster_guid==m_target->GetGUID() &&
m_spellProto->Stances && m_spellProto->Stances &&
!(m_spellProto->AttributesEx2 & SPELL_ATTR_EX2_NOT_NEED_SHAPESHIFT) && !(m_spellProto->AttributesEx2 & SPELL_ATTR_EX2_NOT_NEED_SHAPESHIFT) &&
!(m_spellProto->Attributes & SPELL_ATTR_NOT_SHAPESHIFT)); !(m_spellProto->Attributes & SPELL_ATTR_NOT_SHAPESHIFT));
} }
@ -6013,7 +6013,7 @@ void Aura::PeriodicTick()
Powers pt = m_target->getPowerType(); Powers pt = m_target->getPowerType();
if(int32(pt) != m_modifier.m_miscvalue) if(int32(pt) != m_modifier.m_miscvalue)
return; return;
if ( GetSpellProto()->AuraInterruptFlags & AURA_INTERRUPT_FLAG_NOT_SEATED ) if ( GetSpellProto()->AuraInterruptFlags & AURA_INTERRUPT_FLAG_NOT_SEATED )
{ {
// eating anim // eating anim
@ -6024,7 +6024,7 @@ void Aura::PeriodicTick()
// cannibalize anim // cannibalize anim
m_target->HandleEmoteCommand(EMOTE_STATE_CANNIBALIZE); m_target->HandleEmoteCommand(EMOTE_STATE_CANNIBALIZE);
} }
// Warrior talent, gain 1 rage every 3 seconds while in combat // Warrior talent, gain 1 rage every 3 seconds while in combat
if(pt == POWER_RAGE && m_target->isInCombat()) if(pt == POWER_RAGE && m_target->isInCombat())
m_target->ModifyPower(pt, m_modifier.m_amount*10/17); m_target->ModifyPower(pt, m_modifier.m_amount*10/17);

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "7271" #define REVISION_NR "7272"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__