games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-19 21:10:12 +02:00
Code Issues Releases Activity

Fixed http://bugs.vcmi.eu/view.php?id=2269

Browse Source
This commit is contained in:
AlexVinS 2016-09-24 11:25:29 +03:00
parent 7874dffa7d
commit a03419e7d9
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/spells/BattleSpellMechanics.cpp
View File

@ -425,7 +425,11 @@ bool ObstacleMechanics::isHexAviable(const CBattleInfoCallback * cb, const Battl
if(!mustBeClear)
return true;
if(cb->battleGetStackByPos(hex, true) || !!cb->battleGetObstacleOnPos(hex, false))
if(cb->battleGetStackByPos(hex, true))
return false;
auto obst = cb->battleGetObstacleOnPos(hex, false);
if(obst /*&& obst->type != CObstacleInstance::MOAT*/)//todo: issue 2366, uncomment once obstacle tile sharing implemented
return false;
if(nullptr != cb->battleGetDefendedTown() && CGTownInstance::NONE != cb->battleGetDefendedTown()->fortLevel())
@ -483,6 +487,17 @@ void PatchObstacleMechanics::applyBattleEffects(const SpellCastEnvironment * env
placeObstacle(env, parameters, availableTiles.at(i));
}
ESpellCastProblem::ESpellCastProblem PatchObstacleMechanics::canBeCast(const CBattleInfoCallback * cb, const ECastingMode::ECastingMode mode, const ISpellCaster * caster) const
{
//Quicksand|LandMine are useless if enemy has native stack, check for LandMine damage immunity is done in general way by CSpell
const ui8 otherSide = !cb->playerToSide(caster->getOwner());
if(cb->battleHasNativeStack(otherSide))
return ESpellCastProblem::NO_APPROPRIATE_TARGET;
return DefaultSpellMechanics::canBeCast(cb, mode, caster);
}
///LandMineMechanics
bool LandMineMechanics::requiresCreatureTarget() const
{

1
lib/spells/BattleSpellMechanics.h
View File

@ -113,6 +113,7 @@ class PatchObstacleMechanics : public ObstacleMechanics
{
public:
PatchObstacleMechanics(CSpell * s): ObstacleMechanics(s){};
ESpellCastProblem::ESpellCastProblem canBeCast(const CBattleInfoCallback * cb, const ECastingMode::ECastingMode mode, const ISpellCaster * caster) const override;
protected:
void applyBattleEffects(const SpellCastEnvironment * env, const BattleSpellCastParameters & parameters, SpellCastContext & ctx) const override;
};