josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix CRLF... please be sure to check your win32text settings, including cleverencode/cleverdecode settings before pushing to the repo

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Paradox
2009-05-29 08:32:59 -04:00
parent 861aad532b
commit 3a223e0e80
2 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Player.cpp
+20 -20
View File
@@ -16706,26 +16706,26 @@ void Player::AddSpellMod(SpellModifier* mod, bool apply)
}
}
// Restore spellmods in case of failed cast
void Player::RestoreSpellMods(Spell const* spell)
{
if(!spell || (m_SpellModRemoveCount == 0))
return;
for(int i=0;i<MAX_SPELLMOD;++i)
{
for (SpellModList::iterator itr = m_spellMods[i].begin(); itr != m_spellMods[i].end();++itr)
{
SpellModifier *mod = *itr;
if (mod && mod->charges == -1 && mod->lastAffected == spell)
{
mod->lastAffected = NULL;
mod->charges = 1;
m_SpellModRemoveCount--;
}
}
}
// Restore spellmods in case of failed cast
void Player::RestoreSpellMods(Spell const* spell)
{
if(!spell || (m_SpellModRemoveCount == 0))
return;
for(int i=0;i<MAX_SPELLMOD;++i)
{
for (SpellModList::iterator itr = m_spellMods[i].begin(); itr != m_spellMods[i].end();++itr)
{
SpellModifier *mod = *itr;
if (mod && mod->charges == -1 && mod->lastAffected == spell)
{
mod->lastAffected = NULL;
mod->charges = 1;
m_SpellModRemoveCount--;
}
}
}
}
void Player::RemoveSpellMods(Spell const* spell)
src/game/Spell.cpp
+7 -7
View File
@@ -2721,13 +2721,13 @@ void Spell::finish(bool ok)
if(!m_caster->IsNonMeleeSpellCasted(false, false, true))
m_caster->clearUnitState(UNIT_STAT_CASTING);
if(!ok)
{
//restore spell mods
if (m_caster->GetTypeId() == TYPEID_PLAYER)
((Player*)m_caster)->RestoreSpellMods(this);
return;
}
if(!ok)
{
//restore spell mods
if (m_caster->GetTypeId() == TYPEID_PLAYER)
((Player*)m_caster)->RestoreSpellMods(this);
return;
}
// other code related only to successfully finished spells
//remove spell mods