games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

* fixed bug 257

Browse Source 
* minor changes
This commit is contained in:
mateuszb
2011-02-09 15:19:53 +00:00
parent 454beba90c
commit 8b8d06ac64
6 changed files with 40 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/CHeroHandler.cpp
View File

@@ -93,9 +93,9 @@ int CObstacleInfo::getHeight() const
return ret;
}
std::vector<int> CObstacleInfo::getBlocked(int hex) const
std::vector<THex> CObstacleInfo::getBlocked(THex hex) const
{
std::vector<int> ret;
std::vector<THex> ret;
int cur = hex; //currently browsed hex
int curBeg = hex; //beginning of current line
for(int h=0; h<blockmap.size(); ++h)
@@ -107,16 +107,12 @@ std::vector<int> CObstacleInfo::getBlocked(int hex) const
++cur;
break;
case 'L':
if((cur/17)%2 == 0)
cur = curBeg + BFIELD_WIDTH;
if((cur/BFIELD_WIDTH)%2 == 1)
{
cur = curBeg + 17;
curBeg = cur;
}
else
{
cur = curBeg + 16;
curBeg = cur;
cur--;
}
curBeg = cur;
break;
case 'N':
++cur;
@@ -126,9 +122,9 @@ std::vector<int> CObstacleInfo::getBlocked(int hex) const
return ret;
}
int CObstacleInfo::getMaxBlocked(int hex) const
THex CObstacleInfo::getMaxBlocked(THex hex) const
{
std::vector<int> blocked = getBlocked(hex);
std::vector<THex> blocked = getBlocked(hex);
return *std::max_element(blocked.begin(), blocked.end());
}