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

Move TargetInfo initialization to constructor

Browse Source
This commit is contained in:
AlexVinS 2014-11-13 06:29:41 +03:00
parent 0015027ec7
commit b62ee20880
2 changed files with 39 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
lib/CSpellHandler.cpp
View File

@ -388,7 +388,7 @@ std::set<const CStack* > CSpell::getAffectedStacks(const CBattleInfoCallback * c
const ui8 attackerSide = cb->playerToSide(casterColor) == 1; const ui8 attackerSide = cb->playerToSide(casterColor) == 1;
const auto attackedHexes = rangeInHexes(destination, spellLvl, attackerSide); const auto attackedHexes = rangeInHexes(destination, spellLvl, attackerSide);
const CSpell::TargetInfo ti = getTargetInfoEx(spellLvl, mode); const CSpell::TargetInfo ti(this, spellLvl, mode);
//TODO: more generic solution for mass spells //TODO: more generic solution for mass spells
@ -506,37 +506,10 @@ CSpell::ETargetType CSpell::getTargetType() const
CSpell::TargetInfo CSpell::getTargetInfo(const int level) const CSpell::TargetInfo CSpell::getTargetInfo(const int level) const
{ {
TargetInfo info; TargetInfo info(this, level);
auto & levelInfo = getLevelInfo(level);
info.type = getTargetType();
info.smart = levelInfo.smartTarget;
info.massive = levelInfo.range == "X";
info.onlyAlive = !isRisingSpell();
info.alwaysHitDirectly = false;
return info; return info;
} }
CSpell::TargetInfo CSpell::getTargetInfoEx(const int level, ECastingMode::ECastingMode mode) const
{
TargetInfo info = getTargetInfo(level);
if(mode == ECastingMode::ENCHANTER_CASTING)
{
info.smart = true; //FIXME: not sure about that, this makes all spells smart in this mode
info.massive = true;
}
else if(mode == ECastingMode::SPELL_LIKE_ATTACK)
{
info.alwaysHitDirectly = true;
}
return info;
}
bool CSpell::isCombatSpell() const bool CSpell::isCombatSpell() const
{ {
return combatSpell; return combatSpell;
@ -807,6 +780,36 @@ void CSpell::setupMechanics()
} }
///CSpell::TargetInfo
CSpell::TargetInfo::TargetInfo(const CSpell * spell, const int level)
{
init(spell, level);
}
CSpell::TargetInfo::TargetInfo(const CSpell * spell, const int level, ECastingMode::ECastingMode mode)
{
init(spell, level);
if(mode == ECastingMode::ENCHANTER_CASTING)
{
smart = true; //FIXME: not sure about that, this makes all spells smart in this mode
massive = true;
}
else if(mode == ECastingMode::SPELL_LIKE_ATTACK)
{
alwaysHitDirectly = true;
}
}
void CSpell::TargetInfo::init(const CSpell * spell, const int level)
{
auto & levelInfo = spell->getLevelInfo(level);
type = spell->getTargetType();
smart = levelInfo.smartTarget;
massive = levelInfo.range == "X";
onlyAlive = !spell->isRisingSpell();
alwaysHitDirectly = false;
}
bool DLL_LINKAGE isInScreenRange(const int3 &center, const int3 &pos) bool DLL_LINKAGE isInScreenRange(const int3 &center, const int3 &pos)

8
lib/CSpellHandler.h
View File

@ -135,6 +135,12 @@ public:
bool onlyAlive; bool onlyAlive;
///no immunity on primary target (mostly spell-like attack) ///no immunity on primary target (mostly spell-like attack)
bool alwaysHitDirectly; bool alwaysHitDirectly;
TargetInfo(const CSpell * spell, const int level);
TargetInfo(const CSpell * spell, const int level, ECastingMode::ECastingMode mode);
private:
void init(const CSpell * spell, const int level);
}; };
SpellID id; SpellID id;
@ -167,7 +173,7 @@ public:
ETargetType getTargetType() const; //deprecated ETargetType getTargetType() const; //deprecated
CSpell::TargetInfo getTargetInfo(const int level) const; CSpell::TargetInfo getTargetInfo(const int level) const;
CSpell::TargetInfo getTargetInfoEx(const int level, ECastingMode::ECastingMode mode) const;
bool isCombatSpell() const; bool isCombatSpell() const;
bool isAdventureSpell() const; bool isAdventureSpell() const;