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

Cleanup

Browse Source
This commit is contained in:
AlexVinS 2018-02-10 04:03:17 +03:00
parent b194f8f13b
commit 10dd7e8a43
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/spells/CSpellHandler.cpp
View File

@ -82,7 +82,14 @@ static const ESpellSchool SCHOOL_ORDER[4] =
///CSpell::LevelInfo ///CSpell::LevelInfo
CSpell::LevelInfo::LevelInfo() CSpell::LevelInfo::LevelInfo()
:description(""),cost(0),power(0),AIValue(0),smartTarget(true), clearTarget(false), clearAffected(false), range("0") : description(""),
cost(0),
power(0),
AIValue(0),
smartTarget(true),
clearTarget(false),
clearAffected(false),
range("0")
{ {
} }
@ -563,8 +570,6 @@ CSpell::TargetInfo::TargetInfo(const CSpell * spell, const int level, spells::Mo
: type(spell->getTargetType()), : type(spell->getTargetType()),
smart(false), smart(false),
massive(false), massive(false),
onlyAlive(!spell->isRisingSpell()),
alwaysHitDirectly(false),
clearAffected(false), clearAffected(false),
clearTarget(false) clearTarget(false)
{ {
@ -580,10 +585,6 @@ CSpell::TargetInfo::TargetInfo(const CSpell * spell, const int level, spells::Mo
smart = true; //FIXME: not sure about that, this makes all spells smart in this mode smart = true; //FIXME: not sure about that, this makes all spells smart in this mode
massive = true; massive = true;
} }
else if(mode == spells::Mode::SPELL_LIKE_ATTACK)
{
alwaysHitDirectly = true;
}
else if(mode == spells::Mode::CREATURE_ACTIVE) else if(mode == spells::Mode::CREATURE_ACTIVE)
{ {
massive = false;//FIXME: find better solution for Commander spells massive = false;//FIXME: find better solution for Commander spells

4
lib/spells/CSpellHandler.h
View File

@ -213,10 +213,6 @@ public:
spells::AimType type; spells::AimType type;
bool smart; bool smart;
bool massive; bool massive;
bool onlyAlive;
///no immunity on primary target (mostly spell-like attack)
bool alwaysHitDirectly;
bool clearAffected; bool clearAffected;
bool clearTarget; bool clearTarget;