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

- Possible fix for #1769

Browse Source 
- Fixed all possible (even unexpected) crashes when AI looses active hero
This commit is contained in:
DjWarmonger 2014-05-18 13:13:31 +02:00
parent 0412fe29b0
commit 6658e173f1
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
AI/VCAI/AIUtility.cpp
View File

@ -344,11 +344,12 @@ bool isReachable(const CGObjectInstance *obj)
return cb->getPathInfo(obj->visitablePos())->turns < 255; return cb->getPathInfo(obj->visitablePos())->turns < 255;
} }
bool canBeEmbarkmentPoint(const TerrainTile *t) bool canBeEmbarkmentPoint(const TerrainTile *t, bool fromWater)
{ {
//tile must be free of with unoccupied boat //tile must be free of with unoccupied boat
return !t->blocked return !t->blocked
|| (t->visitableObjects.size() == 1 && t->topVisitableId() == Obj::BOAT); || (!fromWater && t->visitableObjects.size() == 1 && t->topVisitableId() == Obj::BOAT);
//do not try to board when in water sector
} }
int3 whereToExplore(HeroPtr h) int3 whereToExplore(HeroPtr h)

2
AI/VCAI/AIUtility.h
View File

@ -183,7 +183,7 @@ int howManyTilesWillBeDiscovered(const int3 &pos, int radious, CCallback * cbp);
int howManyTilesWillBeDiscovered(int radious, int3 pos, crint3 dir); int howManyTilesWillBeDiscovered(int radious, int3 pos, crint3 dir);
void getVisibleNeighbours(const std::vector<int3> &tiles, std::vector<int3> &out); void getVisibleNeighbours(const std::vector<int3> &tiles, std::vector<int3> &out);
bool canBeEmbarkmentPoint(const TerrainTile *t); bool canBeEmbarkmentPoint(const TerrainTile *t, bool fromWater);
bool isBlockedBorderGate(int3 tileToHit); bool isBlockedBorderGate(int3 tileToHit);
bool isReachable(const CGObjectInstance *obj); bool isReachable(const CGObjectInstance *obj);
bool isCloser(const CGObjectInstance *lhs, const CGObjectInstance *rhs); bool isCloser(const CGObjectInstance *lhs, const CGObjectInstance *rhs);

15
AI/VCAI/VCAI.cpp
View File

@ -1681,12 +1681,13 @@ bool VCAI::moveHeroToTile(int3 dst, HeroPtr h)
} }
ret = !i; ret = !i;
} }
if (auto visitedObject = frontOrNull(cb->getVisitableObjs(h->visitablePos()))) //we stand on something interesting if (h)
{ {
if (visitedObject != *h) if (auto visitedObject = frontOrNull(cb->getVisitableObjs(h->visitablePos()))) //we stand on something interesting
performObjectInteraction (visitedObject, h); {
//BNLOG("Hero %s moved from %s to %s at %s", h->name % startHpos % visitedObject->hoverName % h->visitablePos()); if (visitedObject != *h)
//throw goalFulfilledException (CGoal(GET_OBJ).setobjid(visitedObject->id)); performObjectInteraction (visitedObject, h);
}
} }
if(h) //we could have lost hero after last move if(h) //we could have lost hero after last move
{ {
@ -1704,8 +1705,8 @@ bool VCAI::moveHeroToTile(int3 dst, HeroPtr h)
erase_if_present (lockedHeroes, h); //hero seemingly is confused erase_if_present (lockedHeroes, h); //hero seemingly is confused
throw cannotFulfillGoalException("Invalid path found!"); //FIXME: should never happen throw cannotFulfillGoalException("Invalid path found!"); //FIXME: should never happen
} }
logAi->debugStream() << boost::format("Hero %s moved from %s to %s. Returning %d.") % h->name % startHpos % h->visitablePos() % ret;
} }
logAi->debugStream() << boost::format("Hero %s moved from %s to %s. Returning %d.") % h->name % startHpos % h->visitablePos() % ret;
return ret; return ret;
} }
void VCAI::tryRealize(Goals::Explore & g) void VCAI::tryRealize(Goals::Explore & g)
@ -2725,7 +2726,7 @@ void SectorMap::exploreNewSector(crint3 pos, int num, CCallback * cbp)
//parent[neighPos] = curPos; //parent[neighPos] = curPos;
} }
const TerrainTile *nt = cbp->getTile(neighPos, false); const TerrainTile *nt = cbp->getTile(neighPos, false);
if(nt && nt->isWater() != s.water && canBeEmbarkmentPoint(nt)) if(nt && nt->isWater() != s.water && canBeEmbarkmentPoint(nt, s.water))
{ {
s.embarkmentPoints.push_back(neighPos); s.embarkmentPoints.push_back(neighPos);
} }