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

[9491] Restore code commenting style after 9489/9490

Browse source 
Adjust comment style for rest of function and some additional code style cleanup.

Signed-off-by: NoFantasy <nofantasy@nf.no>
This commit is contained in:
NoFantasy 2010-03-01 03:21:59 +01:00
parent 9ba8235649
commit 1f329d2fb3
2 changed files with 77 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/game/SpellAuras.cpp
View file

@ -2249,6 +2249,7 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
switch(m_spellProto->SpellFamilyName) switch(m_spellProto->SpellFamilyName)
{ {
case SPELLFAMILY_GENERIC: case SPELLFAMILY_GENERIC:
{
switch(GetId()) switch(GetId())
{ {
case 1515: // Tame beast case 1515: // Tame beast
@ -2313,7 +2314,9 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
return; return;
} }
break; break;
}
case SPELLFAMILY_WARRIOR: case SPELLFAMILY_WARRIOR:
{
// Overpower // Overpower
if (m_spellProto->SpellFamilyFlags & UI64LIT(0x0000000000000004)) if (m_spellProto->SpellFamilyFlags & UI64LIT(0x0000000000000004))
{ {
@ -2348,7 +2351,9 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
return; return;
} }
break; break;
}
case SPELLFAMILY_SHAMAN: case SPELLFAMILY_SHAMAN:
{
// Tidal Force // Tidal Force
if (GetId() == 55198) if (GetId() == 55198)
{ {
@ -2356,6 +2361,7 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
SpellEntry const* buffEntry = sSpellStore.LookupEntry(55166); SpellEntry const* buffEntry = sSpellStore.LookupEntry(55166);
if (!buffEntry) if (!buffEntry)
return; return;
for(uint32 k = 0; k < buffEntry->StackAmount; ++k) for(uint32 k = 0; k < buffEntry->StackAmount; ++k)
m_target->CastSpell(m_target, buffEntry, true, NULL, this); m_target->CastSpell(m_target, buffEntry, true, NULL, this);
} }
@ -2371,6 +2377,7 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
break; break;
} }
} }
}
// AT REMOVE // AT REMOVE
else else
{ {
@ -2416,6 +2423,7 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
if (finalSpelId) if (finalSpelId)
caster->CastSpell(m_target, finalSpelId, true, NULL, this); caster->CastSpell(m_target, finalSpelId, true, NULL, this);
return; return;
} }
@ -2476,17 +2484,18 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
// when removing aura from one target due to casting Living Bomb at other. // when removing aura from one target due to casting Living Bomb at other.
if (m_duration == 0 || m_removeMode == AURA_REMOVE_BY_DISPEL) if (m_duration == 0 || m_removeMode == AURA_REMOVE_BY_DISPEL)
m_target->CastSpell(m_target,m_modifier.m_amount,true,NULL,this); m_target->CastSpell(m_target,m_modifier.m_amount,true,NULL,this);
return; return;
} }
if (m_removeMode == AURA_REMOVE_BY_DEATH) if (m_removeMode == AURA_REMOVE_BY_DEATH)
{ {
// Stop caster Arcane Missle chanelling on death // Stop caster Arcane Missle chanelling on death
if (m_spellProto->SpellFamilyName == SPELLFAMILY_MAGE && if (m_spellProto->SpellFamilyName == SPELLFAMILY_MAGE && (m_spellProto->SpellFamilyFlags & UI64LIT(0x0000000000000800)))
(m_spellProto->SpellFamilyFlags & UI64LIT(0x0000000000000800)))
{ {
if (Unit* caster = GetCaster()) if (Unit* caster = GetCaster())
caster->InterruptSpell(CURRENT_CHANNELED_SPELL); caster->InterruptSpell(CURRENT_CHANNELED_SPELL);
return; return;
} }
} }
@ -2500,12 +2509,10 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
{ {
switch(GetId()) switch(GetId())
{ {
// Recently Bandaged case 11196: // Recently Bandaged
case 11196:
m_target->ApplySpellImmune(GetId(), IMMUNITY_MECHANIC, GetMiscValue(), apply); m_target->ApplySpellImmune(GetId(), IMMUNITY_MECHANIC, GetMiscValue(), apply);
return; return;
// Unstable Power case 24658: // Unstable Power
case 24658:
{ {
uint32 spellId = 24659; uint32 spellId = 24659;
if (apply) if (apply)
@ -2517,13 +2524,13 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
for (uint32 i = 0; i < spell->StackAmount; ++i) for (uint32 i = 0; i < spell->StackAmount; ++i)
caster->CastSpell(m_target, spellId, true, NULL, NULL, GetCasterGUID()); caster->CastSpell(m_target, spellId, true, NULL, NULL, GetCasterGUID());
return; return;
} }
m_target->RemoveAurasDueToSpell(spellId); m_target->RemoveAurasDueToSpell(spellId);
return; return;
} }
// Restless Strength case 24661: // Restless Strength
case 24661:
{ {
uint32 spellId = 24662; uint32 spellId = 24662;
if (apply) if (apply)
@ -2532,8 +2539,10 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
Unit* caster = GetCaster(); Unit* caster = GetCaster();
if (!spell || !caster) if (!spell || !caster)
return; return;
for (uint32 i=0; i < spell->StackAmount; ++i) for (uint32 i=0; i < spell->StackAmount; ++i)
caster->CastSpell(m_target, spell->Id, true, NULL, NULL, GetCasterGUID()); caster->CastSpell(m_target, spell->Id, true, NULL, NULL, GetCasterGUID());
return; return;
} }
m_target->RemoveAurasDueToSpell(spellId); m_target->RemoveAurasDueToSpell(spellId);
@ -2592,8 +2601,7 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
} }
return; return;
} }
//Summon Fire Elemental case 40133: //Summon Fire Elemental
case 40133:
{ {
Unit* caster = GetCaster(); Unit* caster = GetCaster();
if (!caster) if (!caster)
@ -2609,8 +2617,7 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
} }
return; return;
} }
//Summon Earth Elemental case 40132: //Summon Earth Elemental
case 40132 :
{ {
Unit* caster = GetCaster(); Unit* caster = GetCaster();
if (!caster) if (!caster)
@ -2626,8 +2633,7 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
} }
return; return;
} }
//Dragonmaw Illusion case 40214: //Dragonmaw Illusion
case 40214 :
{ {
if (apply) if (apply)
{ {
@ -2641,8 +2647,7 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
} }
return; return;
} }
// LK Intro VO (1) case 58204: // LK Intro VO (1)
case 58204:
if (m_target->GetTypeId() == TYPEID_PLAYER) if (m_target->GetTypeId() == TYPEID_PLAYER)
{ {
// Play part 1 // Play part 1
@ -2653,8 +2658,7 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
m_target->CastSpell(m_target, 58205, true); m_target->CastSpell(m_target, 58205, true);
} }
return; return;
// LK Intro VO (2) case 58205: // LK Intro VO (2)
case 58205:
if (m_target->GetTypeId() == TYPEID_PLAYER) if (m_target->GetTypeId() == TYPEID_PLAYER)
{ {
// Play part 2 // Play part 2

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 "9490" #define REVISION_NR "9491"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__