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

- gcc compile fixes

Browse Source 
- fixed locale issue
- Makefiles for StupidAI
- fix for #671 (not tested)
- linux readme update, including #598
This commit is contained in:
Ivan Savenko
2011-02-28 15:14:26 +00:00
parent 23d0221611
commit a2f512813f
13 changed files with 691 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/BattleState.cpp
View File

@ -1597,7 +1597,7 @@ BattleInfo * BattleInfo::setupBattle( int3 tile, int terrain, int terType, const
curB->tacticDistance = 0;
// workaround � bonuses affecting only enemy
// workaround — bonuses affecting only enemy
for(int i = 0; i < 2; i++)
{
TNodes nodes;
@ -1658,7 +1658,7 @@ SpellCasting::ESpellCastProblem BattleInfo::battleCanCastThisSpell( int player,
int cside = sides[0] == player ? 0 : 1; //caster's side
switch(mode)
{
HERO_CASTING:
case SpellCasting::HERO_CASTING:
{
const CGHeroInstance * caster = heroes[cside];
if(!caster->canCastThisSpell(spell))
@ -1769,15 +1769,13 @@ const CGHeroInstance * BattleInfo::getHero( int player ) const
return heroes[1];
}
bool NegateRemover(const Bonus* b)
{
return b->source == Bonus::CREATURE_ABILITY;
}
SpellCasting::ESpellCastProblem BattleInfo::battleIsImmune( int player, const CSpell * spell, SpellCasting::ECastingMode mode, THex dest ) const
{
struct NegateRemover
{
bool operator()(const Bonus* b)
{
return b->source == Bonus::CREATURE_ABILITY;
}
};
const CStack * subject = getStackT(dest, false);
const CGHeroInstance * caster = mode == SpellCasting::HERO_CASTING ? getHero(player) : NULL;
if(subject)
@ -1785,7 +1783,7 @@ SpellCasting::ESpellCastProblem BattleInfo::battleIsImmune( int player, const CS
BonusList immunities = subject->getBonuses(Selector::type(Bonus::LEVEL_SPELL_IMMUNITY));
if(subject->hasBonusOfType(Bonus::NEGATE_ALL_NATURAL_IMMUNITIES))
{
std::remove_if(immunities.begin(), immunities.end(), NegateRemover());
std::remove_if(immunities.begin(), immunities.end(), NegateRemover);
}
if(subject->hasBonusOfType(Bonus::SPELL_IMMUNITY, spell->id)