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

Fixed #103

Browse Source
This commit is contained in:
Michał W. Urbańczyk
2010-07-10 02:15:49 +00:00
parent 10463155d8
commit b1a916fb15
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/CGameState.cpp
View File

@ -1764,7 +1764,7 @@ void CGameState::loadTownDInfos()
} }
} }
void CGameState::getNeighbours( const TerrainTile &srct, int3 tile, std::vector<int3> &vec, const boost::logic::tribool &onLand ) void CGameState::getNeighbours(const TerrainTile &srct, int3 tile, std::vector<int3> &vec, const boost::logic::tribool &onLand, bool limitCoastSailing)
{ {
static int3 dirs[] = { int3(0,1,0),int3(0,-1,0),int3(-1,0,0),int3(+1,0,0), static int3 dirs[] = { int3(0,1,0),int3(0,-1,0),int3(-1,0,0),int3(+1,0,0),
int3(1,1,0),int3(-1,1,0),int3(1,-1,0),int3(-1,-1,0) }; int3(1,1,0),int3(-1,1,0),int3(1,-1,0),int3(-1,-1,0) };
@ -1784,6 +1784,17 @@ void CGameState::getNeighbours( const TerrainTile &srct, int3 tile, std::vector<
continue; continue;
} }
if(srct.tertype == TerrainTile::water && limitCoastSailing && hlpt.tertype == TerrainTile::water && dirs[i].x && dirs[i].y) //diagonal move through water
{
int3 hlp1 = tile,
hlp2 = tile;
hlp1.x += dirs[i].x;
hlp2.y += dirs[i].y;
if(map->getTile(hlp1).tertype != TerrainTile::water || map->getTile(hlp2).tertype != TerrainTile::water)
continue;
}
if((indeterminate(onLand) || onLand == (hlpt.tertype!=TerrainTile::water) ) if((indeterminate(onLand) || onLand == (hlpt.tertype!=TerrainTile::water) )
&& hlpt.tertype != TerrainTile::rock) && hlpt.tertype != TerrainTile::rock)
{ {
@ -1836,7 +1847,7 @@ int CGameState::getMovementCost(const CGHeroInstance *h, const int3 &src, const
if(checkLast && left > 0 && remainingMovePoints-ret < 250) //it might be the last tile - if no further move possible we take all move points if(checkLast && left > 0 && remainingMovePoints-ret < 250) //it might be the last tile - if no further move possible we take all move points
{ {
std::vector<int3> vec; std::vector<int3> vec;
getNeighbours(d, dest, vec, s.tertype != TerrainTile::water); getNeighbours(d, dest, vec, s.tertype != TerrainTile::water, true);
for(size_t i=0; i < vec.size(); i++) for(size_t i=0; i < vec.size(); i++)
{ {
int fcost = getMovementCost(h,dest,vec[i],left,false); int fcost = getMovementCost(h,dest,vec[i],left,false);
@ -2073,7 +2084,7 @@ bool CGameState::getPath(int3 src, int3 dest, const CGHeroInstance * hero, CPath
} }
//add accessible neighbouring nodes to the queue //add accessible neighbouring nodes to the queue
getNeighbours(map->getTile(cp.coord), cp.coord, neighbours, boost::logic::indeterminate); getNeighbours(map->getTile(cp.coord), cp.coord, neighbours, boost::logic::indeterminate, true);
for(unsigned int i=0; i < neighbours.size(); i++) for(unsigned int i=0; i < neighbours.size(); i++)
{ {
CPathNode & dp = graph[neighbours[i].x][neighbours[i].y]; CPathNode & dp = graph[neighbours[i].x][neighbours[i].y];
@ -2264,7 +2275,7 @@ void CGameState::calculatePaths(const CGHeroInstance *hero, CPathsInfo &out, int
} }
//add accessible neighbouring nodes to the queue //add accessible neighbouring nodes to the queue
getNeighbours(ct, cp->coord, neighbours, boost::logic::indeterminate); getNeighbours(ct, cp->coord, neighbours, boost::logic::indeterminate, !onLand);
for(unsigned int i=0; i < neighbours.size(); i++) for(unsigned int i=0; i < neighbours.size(); i++)
{ {
int moveAtNextTile = movement; int moveAtNextTile = movement;

2
lib/CGameState.h
View File

@ -437,7 +437,7 @@ public:
CGameState(); //c-tor CGameState(); //c-tor
~CGameState(); //d-tor ~CGameState(); //d-tor
void getNeighbours(const TerrainTile &srct, int3 tile, std::vector<int3> &vec, const boost::logic::tribool &onLand); void getNeighbours(const TerrainTile &srct, int3 tile, std::vector<int3> &vec, const boost::logic::tribool &onLand, bool limitCoastSailing);
int getMovementCost(const CGHeroInstance *h, const int3 &src, const int3 &dest, int remainingMovePoints=-1, bool checkLast=true); int getMovementCost(const CGHeroInstance *h, const int3 &src, const int3 &dest, int remainingMovePoints=-1, bool checkLast=true);
int getDate(int mode=0) const; //mode=0 - total days in game, mode=1 - day of week, mode=2 - current week, mode=3 - current month int getDate(int mode=0) const; //mode=0 - total days in game, mode=1 - day of week, mode=2 - current week, mode=3 - current month
template <typename Handler> void serialize(Handler &h, const int version) template <typename Handler> void serialize(Handler &h, const int version)