games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Code Issues Releases Activity

Fixed major RMG bug.

Browse Source
This commit is contained in:
DjWarmonger 2014-09-21 20:57:42 +02:00
parent e77f328844
commit 5cb6eaa252
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/CGameState.cpp
View File

@ -3281,6 +3281,7 @@ void CPathfinder::calculatePaths(int3 src /*= int3(-1,-1,-1)*/, int movement /*=
{ {
assert(hero); assert(hero);
assert(hero == getHero(hero->id)); assert(hero == getHero(hero->id));
if(src.x < 0) if(src.x < 0)
src = hero->getPosition(false); src = hero->getPosition(false);
if(movement < 0) if(movement < 0)
@ -3303,9 +3304,9 @@ void CPathfinder::calculatePaths(int3 src /*= int3(-1,-1,-1)*/, int movement /*=
return; return;
} }
//logGlobal->infoStream() << boost::format("Calculating paths for hero %s (adress %d) of player %d") % hero->name % hero % hero->tempOwner;
initializeGraph(); initializeGraph();
//initial tile - set cost on 0 and add to the queue //initial tile - set cost on 0 and add to the queue
CGPathNode &initialNode = *getNode(src); CGPathNode &initialNode = *getNode(src);
initialNode.turns = 0; initialNode.turns = 0;
@ -3457,7 +3458,7 @@ CGPathNode::EAccessibility CPathfinder::evaluateAccessibility(const TerrainTile
{ {
for(const CGObjectInstance *obj : tinfo->visitableObjects) for(const CGObjectInstance *obj : tinfo->visitableObjects)
{ {
if(obj->passableFor(hero->tempOwner)) //special object instance specific passableness flag - overwrites other accessibility flags if (obj->passableFor(hero->tempOwner))
{ {
ret = CGPathNode::ACCESSIBLE; ret = CGPathNode::ACCESSIBLE;
} }

15
lib/mapObjects/CGTownInstance.cpp
View File

@ -525,7 +525,7 @@ void CGTownInstance::onHeroLeave(const CGHeroInstance * h) const
if (visitingHero == h) if (visitingHero == h)
{ {
cb->stopHeroVisitCastle(this, h); cb->stopHeroVisitCastle(this, h);
logGlobal->warnStream() << h->name << " correctly left town " << name; //logGlobal->warnStream() << h->name << " correctly left town " << name;
} }
else else
logGlobal->warnStream() << "Warning, " << h->name << " tries to leave the town " << name << " but hero is not inside."; logGlobal->warnStream() << "Warning, " << h->name << " tries to leave the town " << name << " but hero is not inside.";
@ -912,12 +912,13 @@ bool CGTownInstance::addBonusIfBuilt(BuildingID building, Bonus::BonusType type,
void CGTownInstance::setVisitingHero(CGHeroInstance *h) void CGTownInstance::setVisitingHero(CGHeroInstance *h)
{ {
if (!(!!visitingHero == !h)) //if (!(!!visitingHero == !h))
{ //{
logGlobal->warnStream() << boost::format("Hero visiting town %s is %s ") % name % (visitingHero.get() ? visitingHero->name : "NULL"); // logGlobal->warnStream() << boost::format("Hero visiting town %s is %s ") % name % (visitingHero.get() ? visitingHero->name : "NULL");
logGlobal->warnStream() << boost::format("New hero will be %s ") % (h ? h->name : "NULL"); // logGlobal->warnStream() << boost::format("New hero will be %s ") % (h ? h->name : "NULL");
assert(!!visitingHero == !h); //
} //}
assert(!!visitingHero == !h);
if(h) if(h)
{ {

1
lib/rmg/CRmgTemplateZone.cpp
View File

@ -1393,7 +1393,6 @@ void CRmgTemplateZone::checkAndPlaceObject(CMapGenerator* gen, CGObjectInstance*
object->appearance = templates.front(); object->appearance = templates.front();
} }
gen->map->addBlockVisTiles(object);
gen->editManager->insertObject(object, pos); gen->editManager->insertObject(object, pos);
//logGlobal->traceStream() << boost::format ("Successfully inserted object (%d,%d) at pos %s") %object->ID %object->subID %pos(); //logGlobal->traceStream() << boost::format ("Successfully inserted object (%d,%d) at pos %s") %object->ID %object->subID %pos();
} }