games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-29 23:07:48 +02:00
Code Issues Releases Activity

* hopefully resolved bugs 19 and 20 reported by Zamolxis

Browse Source
This commit is contained in:
mateuszb
2009-02-06 15:56:03 +00:00
parent ba9b58d3a4
commit 811e6c0945
5 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CPathfinder.cpp
View File

@@ -180,8 +180,8 @@ void CPathfinder::convertPath(CPath * path, unsigned int mode) //mode=0 -> from
void CPathfinder::processNode(CPathNode & dp, const CGHeroInstance * hero, std::queue<CPathNode> & mq, const CPathNode & cp, const int3 & src, bool diagonal) void CPathfinder::processNode(CPathNode & dp, const CGHeroInstance * hero, std::queue<CPathNode> & mq, const CPathNode & cp, const int3 & src, bool diagonal)
{ {
const TerrainTile * tinfo = CGI->mh->ttiles[dp.coord.x][dp.coord.y][src.z].tileInfo; const TerrainTile * tinfo = CGI->mh->ttiles[dp.coord.x][dp.coord.y][src.z].tileInfo;
int cost = hero->getTileCost(tinfo->tertype, tinfo->malle, tinfo->nuine); int cost = hero->getTileCost(tinfo->tertype, tinfo->malle, tinfo->nuine, hero->movement - cp.dist);
if(diagonal) if(diagonal && (hero->movement - cp.dist) > 145) //second condition - workaround for strange behaviour manifested by Heroes III
cost *= std::sqrt(2.0); cost *= std::sqrt(2.0);
if((dp.dist==-1 || (dp.dist > cp.dist + cost)) && dp.accesible && checkForVisitableDir(cp.coord, dp.coord) && checkForVisitableDir(dp.coord, cp.coord)) if((dp.dist==-1 || (dp.dist > cp.dist + cost)) && dp.accesible && checkForVisitableDir(cp.coord, dp.coord) && checkForVisitableDir(dp.coord, cp.coord))
{ {

12
CPlayerInterface.cpp
View File

@@ -2506,7 +2506,17 @@ void CHeroList::select(int which)
selected = which; selected = which;
LOCPLINT->adventureInt->centerOn(items[which].first->pos); LOCPLINT->adventureInt->centerOn(items[which].first->pos);
LOCPLINT->adventureInt->selection = items[which].first; LOCPLINT->adventureInt->selection = items[which].first;
LOCPLINT->adventureInt->terrain.currentPath = items[which].second; //recalculationg path in case of something has changed on map
if(items[which].second)
{
CPath * newPath = CGI->pathf->getPath(items[which].second->startPos(), items[which].second->endPos(), items[which].first);
LOCPLINT->adventureInt->terrain.currentPath = items[which].second = newPath;
}
else
{
LOCPLINT->adventureInt->terrain.currentPath = NULL;
}
//recalculated and assigned
draw(); draw();
LOCPLINT->adventureInt->townList.draw(); LOCPLINT->adventureInt->townList.draw();
LOCPLINT->adventureInt->infoBar.draw(NULL); LOCPLINT->adventureInt->infoBar.draw(NULL);

3
hch/CObjectHandler.cpp
View File

@@ -195,8 +195,9 @@ int lowestSpeed(const CGHeroInstance * chi)
return ret; return ret;
} }
unsigned int CGHeroInstance::getTileCost(const EterrainType & ttype, const Eroad & rdtype, const Eriver & rvtype) const unsigned int CGHeroInstance::getTileCost(const EterrainType & ttype, const Eroad & rdtype, const Eriver & rvtype, const int & remaingMP) const
{ {
if(remaingMP <= 100) return 100; //workaround for strange behaviour manifested by Heroes III
unsigned int ret = type->heroClass->terrCosts[ttype]; unsigned int ret = type->heroClass->terrCosts[ttype];
//applying pathfinding skill //applying pathfinding skill
switch(getSecSkillLevel(0)) switch(getSecSkillLevel(0))

2
hch/CObjectHandler.h
View File

@@ -207,7 +207,7 @@ public:
const HeroBonus *getBonus(int from, int id) const; const HeroBonus *getBonus(int from, int id) const;
const std::string &getBiography() const; const std::string &getBiography() const;
bool needsLastStack()const; bool needsLastStack()const;
unsigned int getTileCost(const EterrainType & ttype, const Eroad & rdtype, const Eriver & rvtype) const; unsigned int getTileCost(const EterrainType & ttype, const Eroad & rdtype, const Eriver & rvtype, const int & remaingMP) const;
unsigned int getLowestCreatureSpeed() const; unsigned int getLowestCreatureSpeed() const;
unsigned int getAdditiveMoveBonus() const; unsigned int getAdditiveMoveBonus() const;
float getMultiplicativeMoveBonus() const; float getMultiplicativeMoveBonus() const;

4
server/CGameHandler.cpp
View File

@@ -495,7 +495,9 @@ void CGameHandler::handleConnection(std::set<int> players, CConnection &c)
int3 hmpos = end + int3(-1,0,0); int3 hmpos = end + int3(-1,0,0);
TerrainTile t = gs->map->terrain[hmpos.x][hmpos.y][hmpos.z]; TerrainTile t = gs->map->terrain[hmpos.x][hmpos.y][hmpos.z];
CGHeroInstance *h = static_cast<CGHeroInstance *>(gs->map->objects[id]); CGHeroInstance *h = static_cast<CGHeroInstance *>(gs->map->objects[id]);
int cost = (int)((double)h->getTileCost(t.tertype,t.malle,t.nuine) * distance(start,end)); double dist = distance(start,end);
if(h->movement <= 145) dist = 1.0f; //workaround for strange behaviour manifested by Heroes III
int cost = (int)((double)h->getTileCost(t.tertype,t.malle,t.nuine, h->movement) * dist);
TryMoveHero tmh; TryMoveHero tmh;
tmh.id = id; tmh.id = id;