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

* cleaner code is better :)

Browse Source
This commit is contained in:
mateuszb
2011-07-03 19:10:36 +00:00
parent ecf33cca91
commit aac1c0b4e7
5 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/BattleState.cpp
View File

@ -2280,29 +2280,16 @@ std::vector<THex> CStack::getHexes() const
{
std::vector<THex> hexes;
hexes.push_back(THex(position));
if (doubleWide())
{
if (attackerOwned)
hexes.push_back(THex(position - 1));
else
hexes.push_back(THex(position + 1));
}
THex occupied = occupiedHex();
if(occupied.isValid())
hexes.push_back(occupied);
return hexes;
}
bool CStack::coversPos(ui16 pos) const
bool CStack::coversPos(THex pos) const
{
if (pos == position)
return true;
if (doubleWide())
{
if (attackerOwned)
return (pos == position - 1);
else
return (pos == position + 1);
}
else
return false;
return vstd::contains(getHexes(), pos);
}
std::vector<si32> CStack::activeSpells() const