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 heroes not unreserving Teleports, which makes them wander around it endlessly and blocking path.

Browse Source 
TODO: properly handle all Teleports as "visited" objects
This commit is contained in:
DjWarmonger
2016-12-19 21:46:01 +01:00
parent ee3aec55f2
commit 6848a52ce1
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
AI/VCAI/VCAI.cpp
View File

@@ -132,6 +132,9 @@ void VCAI::heroMoved(const TryMoveHero & details)
} }
} }
} }
//FIXME: teleports are not correctly visited
unreserveObject(hero, t1);
unreserveObject(hero, t2);
} }
else if(details.result == TryMoveHero::EMBARK && hero) else if(details.result == TryMoveHero::EMBARK && hero)
{ {
@@ -1681,7 +1684,9 @@ void VCAI::waitTillFree()
void VCAI::markObjectVisited (const CGObjectInstance *obj) void VCAI::markObjectVisited (const CGObjectInstance *obj)
{ {
if(dynamic_cast<const CGVisitableOPH *>(obj) || //we may want to wisit it with another hero if(!obj)
return;
if(dynamic_cast<const CGVisitableOPH *>(obj) || //we may want to visit it with another hero
dynamic_cast<const CGBonusingObject *>(obj) || //or another time dynamic_cast<const CGBonusingObject *>(obj) || //or another time
(obj->ID == Obj::MONSTER)) (obj->ID == Obj::MONSTER))
return; return;
@@ -1976,6 +1981,7 @@ bool VCAI::moveHeroToTile(int3 dst, HeroPtr h)
doTeleportMovement(destTeleportObj->id, nextCoord); doTeleportMovement(destTeleportObj->id, nextCoord);
if(teleportChannelProbingList.size()) if(teleportChannelProbingList.size())
doChannelProbing(); doChannelProbing();
markObjectVisited(destTeleportObj); //FIXME: Monoliths are not correctly visited
continue; continue;
} }
@@ -3245,7 +3251,6 @@ bool shouldVisit(HeroPtr h, const CGObjectInstance * obj)
case Obj::MONOLITH_ONE_WAY_EXIT: case Obj::MONOLITH_ONE_WAY_EXIT:
case Obj::MONOLITH_TWO_WAY: case Obj::MONOLITH_TWO_WAY:
case Obj::WHIRLPOOL: case Obj::WHIRLPOOL:
//TODO: mechanism for handling monoliths
return false; return false;
case Obj::SCHOOL_OF_MAGIC: case Obj::SCHOOL_OF_MAGIC:
case Obj::SCHOOL_OF_WAR: case Obj::SCHOOL_OF_WAR: