Removed stupid/not needed file Spellid.h.
--HG-- branch : trunk
This commit is contained in:
1 parent
922b368aac
commit
bcd4a48328
31 files changed
+231
-140390
No files matched your search
+6
-7
@@ -54,7 +54,6 @@
|
||||
#include "TemporarySummon.h"
|
||||
#include "Vehicle.h"
|
||||
#include "Transports.h"
|
||||
#include "SpellId.h"
|
||||
|
||||
#include <math.h>
|
||||
|
||||
@@ -840,7 +839,7 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
|
||||
he->duel->opponent->CombatStopWithPets(true);
|
||||
he->CombatStopWithPets(true);
|
||||
|
||||
he->CastSpell(he, SPELL_GROVEL_7267, true); // beg
|
||||
he->CastSpell(he, 7267, true); // beg
|
||||
he->DuelComplete(DUEL_WON);
|
||||
}
|
||||
}
|
||||
@@ -3282,10 +3281,10 @@ void Unit::_UpdateSpells( uint32 time )
|
||||
void Unit::_UpdateAutoRepeatSpell()
|
||||
{
|
||||
//check "realtime" interrupts
|
||||
if ( (GetTypeId() == TYPEID_PLAYER && ((Player*)this)->isMoving()) || IsNonMeleeSpellCasted(false,false,true,m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->m_spellInfo->Id == SPELL_AUTO_SHOT_75) )
|
||||
if ( (GetTypeId() == TYPEID_PLAYER && ((Player*)this)->isMoving()) || IsNonMeleeSpellCasted(false,false,true,m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->m_spellInfo->Id == 75) )
|
||||
{
|
||||
// cancel wand shoot
|
||||
if(m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->m_spellInfo->Id != SPELL_AUTO_SHOT_75)
|
||||
if(m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->m_spellInfo->Id != 75)
|
||||
InterruptSpell(CURRENT_AUTOREPEAT_SPELL);
|
||||
m_AutoRepeatFirstCast = true;
|
||||
return;
|
||||
@@ -3338,7 +3337,7 @@ void Unit::SetCurrentCastedSpell( Spell * pSpell )
|
||||
if ( m_currentSpells[CURRENT_AUTOREPEAT_SPELL] )
|
||||
{
|
||||
// break autorepeat if not Auto Shot
|
||||
if (m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->m_spellInfo->Id != SPELL_AUTO_SHOT_75)
|
||||
if (m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->m_spellInfo->Id != 75)
|
||||
InterruptSpell(CURRENT_AUTOREPEAT_SPELL);
|
||||
m_AutoRepeatFirstCast = true;
|
||||
}
|
||||
@@ -3353,7 +3352,7 @@ void Unit::SetCurrentCastedSpell( Spell * pSpell )
|
||||
|
||||
// it also does break autorepeat if not Auto Shot
|
||||
if ( m_currentSpells[CURRENT_AUTOREPEAT_SPELL] &&
|
||||
m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->m_spellInfo->Id != SPELL_AUTO_SHOT_75 )
|
||||
m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->m_spellInfo->Id != 75 )
|
||||
InterruptSpell(CURRENT_AUTOREPEAT_SPELL);
|
||||
addUnitState(UNIT_STAT_CASTING);
|
||||
} break;
|
||||
@@ -3361,7 +3360,7 @@ void Unit::SetCurrentCastedSpell( Spell * pSpell )
|
||||
case CURRENT_AUTOREPEAT_SPELL:
|
||||
{
|
||||
// only Auto Shoot does not break anything
|
||||
if (pSpell->m_spellInfo->Id != SPELL_AUTO_SHOT_75)
|
||||
if (pSpell->m_spellInfo->Id != 75)
|
||||
{
|
||||
// generic autorepeats break generic non-delayed and channeled non-delayed spells
|
||||
InterruptSpell(CURRENT_GENERIC_SPELL,false);
|
||||
|
||||
Reference in new issue
Block a user