games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Simplify statements

Browse Source 
-Simplify return statements across the code
This commit is contained in:
Michał Kalinowski
2019-03-20 20:58:15 +01:00
committed by Alexander Shishkin
parent ec536e613c
commit ac6b477aa2
21 changed files with 45 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/spells/effects/UnitEffect.cpp
View File

@@ -93,13 +93,7 @@ EffectTarget UnitEffect::filterTarget(const Mechanics * m, const EffectTarget &
EffectTarget res;
vstd::copy_if(target, std::back_inserter(res), [this, m](const Destination & d)
{
if(!d.unitValue)
return false;
if(!isValidTarget(m, d.unitValue))
return false;
if(!isReceptive(m, d.unitValue))
return false;
return true;
return d.unitValue && isValidTarget(m, d.unitValue) && isReceptive(m, d.unitValue);
});
return res;
}
@@ -271,10 +265,7 @@ bool UnitEffect::isReceptive(const Mechanics * m, const battle::Unit * unit) con
//SPELL_IMMUNITY absolute case
std::stringstream cachingStr;
cachingStr << "type_" << Bonus::SPELL_IMMUNITY << "subtype_" << m->getSpellIndex() << "addInfo_1";
if(unit->hasBonus(Selector::typeSubtypeInfo(Bonus::SPELL_IMMUNITY, m->getSpellIndex(), 1), cachingStr.str()))
return false;
return true;
return !unit->hasBonus(Selector::typeSubtypeInfo(Bonus::SPELL_IMMUNITY, m->getSpellIndex(), 1), cachingStr.str());
}
else
{