mirror of
https://github.com/vcmi/vcmi.git
synced 2026-05-22 09:55:17 +02:00
Merge remote-tracking branch 'upstream/develop' into develop
This commit is contained in:
@@ -26,7 +26,12 @@ ExecuteHeroChain::ExecuteHeroChain(const AIPath & path, const CGObjectInstance *
|
||||
if(obj)
|
||||
{
|
||||
objid = obj->id.getNum();
|
||||
|
||||
#if NKAI_TRACE_LEVEL >= 1
|
||||
targetName = obj->getObjectName() + tile.toString();
|
||||
#else
|
||||
targetName = obj->typeName + tile.toString();
|
||||
#endif
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -260,7 +265,11 @@ void ExecuteHeroChain::accept(AIGateway * ai)
|
||||
|
||||
std::string ExecuteHeroChain::toString() const
|
||||
{
|
||||
#if NKAI_TRACE_LEVEL >= 1
|
||||
return "ExecuteHeroChain " + targetName + " by " + chainPath.toString();
|
||||
#else
|
||||
return "ExecuteHeroChain " + targetName + " by " + chainPath.targetHero->getNameTranslated();
|
||||
#endif
|
||||
}
|
||||
|
||||
bool ExecuteHeroChain::moveHeroToTile(AIGateway * ai, const CGHeroInstance * hero, const int3 & tile)
|
||||
|
||||
Reference in New Issue
Block a user