Changed PreferNoManaCommandSpells check from pre-processor to rules-based criteria

This commit is contained in:
Uleat 2016-03-25 00:39:11 -04:00
parent 66ca522e62
commit 3b6889d5d3

View File

@ -831,7 +831,7 @@ private:
}); });
continue; continue;
case BCEnum::SpT_Identify: case BCEnum::SpT_Identify:
#ifdef PREFER_NO_MANA_COST_SPELLS if (RuleB(Bots, PreferNoManaCommandSpells)) {
spell_list->sort([](const STBaseEntry* l, const STBaseEntry* r) { spell_list->sort([](const STBaseEntry* l, const STBaseEntry* r) {
if (LT_SPELLS(l, r, mana)) if (LT_SPELLS(l, r, mana))
return true; return true;
@ -844,7 +844,8 @@ private:
return false; return false;
}); });
#else }
else {
spell_list->sort([](const STBaseEntry* l, const STBaseEntry* r) { spell_list->sort([](const STBaseEntry* l, const STBaseEntry* r) {
if (LT_STBASE(l, r, target_type)) if (LT_STBASE(l, r, target_type))
return true; return true;
@ -855,7 +856,7 @@ private:
return false; return false;
}); });
#endif }
continue; continue;
case BCEnum::SpT_Invisibility: case BCEnum::SpT_Invisibility:
spell_list->sort([](STBaseEntry* l, STBaseEntry* r) { spell_list->sort([](STBaseEntry* l, STBaseEntry* r) {