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

CPathfinder: move destTopVisObjID where it's belongs to

Browse Source
This commit is contained in:
ArseniyShestakov 2015-10-10 19:02:21 +03:00
parent 13c2b5e2d8
commit ee4305cd6d
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/CGameState.cpp
View File

@ -3411,7 +3411,6 @@ void CPathfinder::calculatePaths()
{ {
dp = getNode(neighbour); dp = getNode(neighbour);
dt = &gs->map->getTile(neighbour); dt = &gs->map->getTile(neighbour);
destTopVisObjID = dt->topVisitableId();
useEmbarkCost = 0; //0 - usual movement; 1 - embark; 2 - disembark useEmbarkCost = 0; //0 - usual movement; 1 - embark; 2 - disembark
const bool destIsGuardian = sourceGuardPosition == neighbour; const bool destIsGuardian = sourceGuardPosition == neighbour;
@ -3552,6 +3551,7 @@ CGPathNode::EAccessibility CPathfinder::evaluateAccessibility(const TerrainTile
bool CPathfinder::goodForLandSeaTransition() bool CPathfinder::goodForLandSeaTransition()
{ {
Obj destTopVisObjID = dt->topVisitableId();
if(cp->land != dp->land) //hero can traverse land<->sea only in special circumstances if(cp->land != dp->land) //hero can traverse land<->sea only in special circumstances
{ {
if(cp->land) //from land to sea -> embark or assault hero on boat if(cp->land) //from land to sea -> embark or assault hero on boat

1
lib/CGameState.h
View File

@ -297,7 +297,6 @@ private:
CGPathNode *dp; //destination node -> it's a neighbour of cp that we consider CGPathNode *dp; //destination node -> it's a neighbour of cp that we consider
const TerrainTile *ct, *dt; //tile info for both nodes const TerrainTile *ct, *dt; //tile info for both nodes
ui8 useEmbarkCost; //0 - usual movement; 1 - embark; 2 - disembark ui8 useEmbarkCost; //0 - usual movement; 1 - embark; 2 - disembark
Obj destTopVisObjID;
CGObjectInstance *sTileObj; CGObjectInstance *sTileObj;
CGObjectInstance *dTileObj; CGObjectInstance *dTileObj;