games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-02-03 13:01:33 +02:00
Code Issues Releases Activity

Reworked SetStackEffect::applyGs

Browse Source 
* fixed applying different duration effects from spells (f.e. Blind)
* reduced code duplication
This commit is contained in:
AlexVinS 2016-09-29 15:23:28 +03:00
parent 810d464d8f
commit d79e336e4b
1 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lib/NetPacksLib.cpp
View File

@ -1543,38 +1543,34 @@ DLL_LINKAGE void SetStackEffect::applyGs( CGameState *gs )
int spellid = effect.begin()->sid; //effects' source ID
auto processEffect = [spellid, this](CStack * sta, const Bonus & effect)
{
if(!sta->hasBonus(Selector::source(Bonus::SPELL_EFFECT, spellid).And(Selector::typeSubtype(effect.type, effect.subtype)))
|| spellid == SpellID::DISRUPTING_RAY || spellid == SpellID::ACID_BREATH_DEFENSE)
{
//no such effect or cumulative - add new
logBonus->traceStream() << sta->nodeName() << " receives a new bonus: " << effect.Description();
sta->addNewBonus( new Bonus(effect));
}
else
actualizeEffect(sta, effect);
};
for(ui32 id : stacks)
{
CStack *s = gs->curB->getStack(id);
if(s)
{
if(spellid == SpellID::DISRUPTING_RAY || spellid == SpellID::ACID_BREATH_DEFENSE || !s->hasBonus(Selector::source(Bonus::SPELL_EFFECT, spellid)))//disrupting ray or acid breath or not on the list - just add
{
for(Bonus &fromEffect : effect)
{
logBonus->traceStream() << s->nodeName() << " receives a new bonus: " << fromEffect.Description();
s->addNewBonus( new Bonus(fromEffect));
}
}
else //just actualize
{
actualizeEffect(s, effect);
}
}
for(const Bonus & fromEffect : effect)
processEffect(s, fromEffect);
else
logNetwork->errorStream() << "Cannot find stack " << id;
}
typedef std::pair<ui32, Bonus> p;
for(p para : uniqueBonuses)
for(auto & para : uniqueBonuses)
{
CStack *s = gs->curB->getStack(para.first);
if (s)
{
if (!s->hasBonus(Selector::source(Bonus::SPELL_EFFECT, spellid).And(Selector::typeSubtype(para.second.type, para.second.subtype))))
s->addNewBonus(new Bonus(para.second));
else
actualizeEffect(s, effect);
}
if(s)
processEffect(s, para.second);
else
logNetwork->errorStream() << "Cannot find stack " << para.first;
}