games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Fixed #679 and #681.

Browse Source
This commit is contained in:
Michał W. Urbańczyk
2011-03-01 13:54:48 +00:00
parent aaf3729367
commit 222bf004b9
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/GUIClasses.cpp
View File

@@ -1843,7 +1843,7 @@ CRecruitmentWindow::CRecruitmentWindow(const CGDwelling *Dwelling, int Level, co
max->block(true); max->block(true);
slider->block(true); slider->block(true);
} }
//buy->block(true); //not needed, will be blocked by initing slider on 0 buy->block(true);
} }
CRecruitmentWindow::~CRecruitmentWindow() CRecruitmentWindow::~CRecruitmentWindow()

16
lib/BattleState.cpp
View File

@@ -1719,7 +1719,7 @@ SpellCasting::ESpellCastProblem BattleInfo::battleCanCastThisSpell( int player,
case 1: case 1:
if(stack->owner == caster->getOwner()) if(stack->owner == caster->getOwner())
{ {
if(battleIsImmune(player, spell, mode, stack->position) == SpellCasting::OK) if(battleIsImmune(caster, spell, mode, stack->position) == SpellCasting::OK)
{ {
targetExists = true; targetExists = true;
break; break;
@@ -1727,7 +1727,7 @@ SpellCasting::ESpellCastProblem BattleInfo::battleCanCastThisSpell( int player,
} }
break; break;
case 0: case 0:
if(battleIsImmune(player, spell, mode, stack->position) == SpellCasting::OK) if(battleIsImmune(caster, spell, mode, stack->position) == SpellCasting::OK)
{ {
targetExists = true; targetExists = true;
break; break;
@@ -1736,7 +1736,7 @@ SpellCasting::ESpellCastProblem BattleInfo::battleCanCastThisSpell( int player,
case -1: case -1:
if(stack->owner != caster->getOwner()) if(stack->owner != caster->getOwner())
{ {
if(battleIsImmune(player, spell, mode, stack->position) == SpellCasting::OK) if(battleIsImmune(caster, spell, mode, stack->position) == SpellCasting::OK)
{ {
targetExists = true; targetExists = true;
break; break;
@@ -1764,11 +1764,12 @@ SpellCasting::ESpellCastProblem BattleInfo::battleCanCastThisSpellHere( int play
if(moreGeneralProblem != SpellCasting::OK) if(moreGeneralProblem != SpellCasting::OK)
return moreGeneralProblem; return moreGeneralProblem;
return battleIsImmune(player, spell, mode, dest); return battleIsImmune(getHero(player), spell, mode, dest);
} }
const CGHeroInstance * BattleInfo::getHero( int player ) const const CGHeroInstance * BattleInfo::getHero( int player ) const
{ {
assert(sides[0] == player || sides[1] == player);
if(heroes[0] && heroes[0]->getOwner() == player) if(heroes[0] && heroes[0]->getOwner() == player)
return heroes[0]; return heroes[0];
@@ -1780,10 +1781,9 @@ bool NegateRemover(const Bonus* b)
return b->source == Bonus::CREATURE_ABILITY; return b->source == Bonus::CREATURE_ABILITY;
} }
SpellCasting::ESpellCastProblem BattleInfo::battleIsImmune( int player, const CSpell * spell, SpellCasting::ECastingMode mode, THex dest ) const SpellCasting::ESpellCastProblem BattleInfo::battleIsImmune(const CGHeroInstance * caster, const CSpell * spell, SpellCasting::ECastingMode mode, THex dest) const
{ {
const CStack * subject = getStackT(dest, false); const CStack * subject = getStackT(dest, false);
const CGHeroInstance * caster = mode == SpellCasting::HERO_CASTING ? getHero(player) : NULL;
if(subject) if(subject)
{ {
BonusList immunities = subject->getBonuses(Selector::type(Bonus::LEVEL_SPELL_IMMUNITY)); BonusList immunities = subject->getBonuses(Selector::type(Bonus::LEVEL_SPELL_IMMUNITY));
@@ -1819,7 +1819,7 @@ SpellCasting::ESpellCastProblem BattleInfo::battleIsImmune( int player, const CS
else else
{ {
if(spell->getTargetType() == CSpell::CREATURE || if(spell->getTargetType() == CSpell::CREATURE ||
(spell->getTargetType() == CSpell::CREATURE_EXPERT_MASSIVE && caster && caster->getSpellSchoolLevel(spell) < 3)) (spell->getTargetType() == CSpell::CREATURE_EXPERT_MASSIVE && mode == SpellCasting::HERO_CASTING && caster && caster->getSpellSchoolLevel(spell) < 3))
{ {
return SpellCasting::WRONG_SPELL_TARGET; return SpellCasting::WRONG_SPELL_TARGET;
} }
@@ -1833,7 +1833,7 @@ std::vector<ui32> BattleInfo::calculateResistedStacks( const CSpell * sp, const
std::vector<ui32> ret; std::vector<ui32> ret;
for(std::set<CStack*>::const_iterator it = affectedCreatures.begin(); it != affectedCreatures.end(); ++it) for(std::set<CStack*>::const_iterator it = affectedCreatures.begin(); it != affectedCreatures.end(); ++it)
{ {
if(battleIsImmune(caster->getOwner(), sp, mode, (*it)->position) != SpellCasting::OK) if(battleIsImmune(caster, sp, mode, (*it)->position) != SpellCasting::OK)
{ {
ret.push_back((*it)->ID); ret.push_back((*it)->ID);
continue; continue;

2
lib/BattleState.h
View File

@@ -118,7 +118,7 @@ struct DLL_EXPORT BattleInfo : public CBonusSystemNode
SpellCasting::ESpellCastProblem battleCanCastSpell(int player, SpellCasting::ECastingMode mode) const; //returns true if there are no general issues preventing from casting a spell SpellCasting::ESpellCastProblem battleCanCastSpell(int player, SpellCasting::ECastingMode mode) const; //returns true if there are no general issues preventing from casting a spell
SpellCasting::ESpellCastProblem battleCanCastThisSpell(int player, const CSpell * spell, SpellCasting::ECastingMode mode) const; //checks if given player can cast given spell SpellCasting::ESpellCastProblem battleCanCastThisSpell(int player, const CSpell * spell, SpellCasting::ECastingMode mode) const; //checks if given player can cast given spell
SpellCasting::ESpellCastProblem battleIsImmune(int player, const CSpell * spell, SpellCasting::ECastingMode mode, THex dest) const; //checks for creature immunity / anything that prevent casting *at given hex* - doesn't take into acount general problems such as not having spellbook or mana points etc. SpellCasting::ESpellCastProblem battleIsImmune(const CGHeroInstance * caster, const CSpell * spell, SpellCasting::ECastingMode mode, THex dest) const; //checks for creature immunity / anything that prevent casting *at given hex* - doesn't take into acount general problems such as not having spellbook or mana points etc.
SpellCasting::ESpellCastProblem battleCanCastThisSpellHere(int player, const CSpell * spell, SpellCasting::ECastingMode mode, THex dest); //checks if given player can cast given spell at given tile in given mode SpellCasting::ESpellCastProblem battleCanCastThisSpellHere(int player, const CSpell * spell, SpellCasting::ECastingMode mode, THex dest); //checks if given player can cast given spell at given tile in given mode
std::vector<ui32> calculateResistedStacks(const CSpell * sp, const CGHeroInstance * caster, const CGHeroInstance * hero2, const std::set<CStack*> affectedCreatures, int casterSideOwner, SpellCasting::ECastingMode mode) const; std::vector<ui32> calculateResistedStacks(const CSpell * sp, const CGHeroInstance * caster, const CGHeroInstance * hero2, const std::set<CStack*> affectedCreatures, int casterSideOwner, SpellCasting::ECastingMode mode) const;