mirrors
/
re3
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed pathfind

This commit is contained in:
aap 2019-05-17 21:38:15 +02:00
parent 5b8f20b08e
commit 58ebd6c6d4
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/PathFind.cpp
View File

@ -19,6 +19,9 @@ enum
PathNodeDeadEnd = 4, PathNodeDeadEnd = 4,
PathNodeDisabled = 8, PathNodeDisabled = 8,
PathNodeBetweenLevels = 0x10, PathNodeBetweenLevels = 0x10,
ConnectionCrossRoad = 1,
ConnectionTrafficLight = 2,
}; };
// link flags: // link flags:
@ -113,18 +116,18 @@ CPathFind::PreparePathData(void)
if(numIntern == 1 && numExtern == 2){ if(numIntern == 1 && numExtern == 2){
if(numLanes < 4){ if(numLanes < 4){
if((i & 7) == 4){ // WHAT? if((i & 7) == 4){ // WHAT?
m_objectFlags[i] |= 1; m_objectFlags[i] |= PathNodeFlag1;
if(maxX > maxY) if(maxX > maxY)
m_objectFlags[i] |= 2; m_objectFlags[i] |= PathNodeFlag2;
else else
m_objectFlags[i] &= ~2; m_objectFlags[i] &= ~PathNodeFlag2;
} }
}else{ }else{
m_objectFlags[i] |= 1; m_objectFlags[i] |= PathNodeFlag1;
if(maxX > maxY) if(maxX > maxY)
m_objectFlags[i] |= 2; m_objectFlags[i] |= PathNodeFlag2;
else else
m_objectFlags[i] &= ~2; m_objectFlags[i] &= ~PathNodeFlag2;
} }
} }
} }
@ -258,7 +261,7 @@ CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoFor
&CoorsXFormed); &CoorsXFormed);
m_pathNodes[m_numPathNodes].pos = CoorsXFormed; m_pathNodes[m_numPathNodes].pos = CoorsXFormed;
m_pathNodes[m_numPathNodes].objectIndex = i; m_pathNodes[m_numPathNodes].objectIndex = i;
m_pathNodes[m_numPathNodes].flags |= 1; m_pathNodes[m_numPathNodes].flags |= PathNodeFlag1;
m_mapObjects[i]->m_nodeIndicesCars[typeoff + j] = m_numPathNodes++; m_mapObjects[i]->m_nodeIndicesCars[typeoff + j] = m_numPathNodes++;
} }
} }
@ -326,9 +329,7 @@ CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoFor
// collapse this node with nearest we found // collapse this node with nearest we found
dx = m_pathNodes[tempnodes[nearestId].link1].pos.x - m_pathNodes[tempnodes[nearestId].link2].pos.x; dx = m_pathNodes[tempnodes[nearestId].link1].pos.x - m_pathNodes[tempnodes[nearestId].link2].pos.x;
dy = m_pathNodes[tempnodes[nearestId].link1].pos.y - m_pathNodes[tempnodes[nearestId].link2].pos.y; dy = m_pathNodes[tempnodes[nearestId].link1].pos.y - m_pathNodes[tempnodes[nearestId].link2].pos.y;
tempnodes[nearestId].pos.x = (tempnodes[nearestId].pos.x + CoorsXFormed.x)*0.5f; tempnodes[nearestId].pos = (tempnodes[nearestId].pos + CoorsXFormed)*0.5f;
tempnodes[nearestId].pos.y = (tempnodes[nearestId].pos.y + CoorsXFormed.y)*0.5f;
tempnodes[nearestId].pos.z = (tempnodes[nearestId].pos.z + CoorsXFormed.z)*0.5f;
mag = sqrt(dx*dx + dy*dy); mag = sqrt(dx*dx + dy*dy);
tempnodes[nearestId].dirX = dx/mag; tempnodes[nearestId].dirX = dx/mag;
tempnodes[nearestId].dirY = dy/mag; tempnodes[nearestId].dirY = dy/mag;
@ -336,8 +337,9 @@ CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoFor
if(type == PathTypeCar) if(type == PathTypeCar)
if(tempnodes[nearestId].numLeftLanes != 0 && tempnodes[nearestId].numRightLanes != 0 && if(tempnodes[nearestId].numLeftLanes != 0 && tempnodes[nearestId].numRightLanes != 0 &&
(objectpathinfo[start + j].numLeftLanes == 0 || objectpathinfo[start + j].numRightLanes == 0)){ (objectpathinfo[start + j].numLeftLanes == 0 || objectpathinfo[start + j].numRightLanes == 0)){
tempnodes[nearestId].numLeftLanes = objectpathinfo[start + j].numLeftLanes; // why switch left and right here?
tempnodes[nearestId].numRightLanes = objectpathinfo[start + j].numRightLanes; tempnodes[nearestId].numLeftLanes = objectpathinfo[start + j].numRightLanes;
tempnodes[nearestId].numRightLanes = objectpathinfo[start + j].numLeftLanes;
} }
} }
} }
@ -457,9 +459,9 @@ CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoFor
// Crosses road // Crosses road
if(objectpathinfo[istart + iseg].next == jseg && objectpathinfo[istart + iseg].flag & 1 || if(objectpathinfo[istart + iseg].next == jseg && objectpathinfo[istart + iseg].flag & 1 ||
objectpathinfo[jstart + jseg].next == iseg && objectpathinfo[jstart + jseg].flag & 1) objectpathinfo[jstart + jseg].next == iseg && objectpathinfo[jstart + jseg].flag & 1)
m_connectionFlags[m_numConnections] |= 1; m_connectionFlags[m_numConnections] |= ConnectionCrossRoad;
else else
m_connectionFlags[m_numConnections] &= ~1; m_connectionFlags[m_numConnections] &= ~ConnectionCrossRoad;
} }
m_pathNodes[i].numLinks++; m_pathNodes[i].numLinks++;
@ -588,4 +590,5 @@ CPathFind::CalcNodeCoors(int16 x, int16 y, int16 z, int id, CVector *out)
STARTPATCHES STARTPATCHES
InjectHook(0x429610, &CPathFind::PreparePathData, PATCH_JUMP); InjectHook(0x429610, &CPathFind::PreparePathData, PATCH_JUMP);
InjectHook(0x429C20, &CPathFind::PreparePathDataForType, PATCH_JUMP); InjectHook(0x429C20, &CPathFind::PreparePathDataForType, PATCH_JUMP);
InjectHook(0x42B810, &CPathFind::CountFloodFillGroups, PATCH_JUMP);
ENDPATCHES ENDPATCHES