ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid infinite recursion when a track with looped shortcuts

Browse Source 
is loaded.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14300 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2013-10-24 06:04:22 +00:00
parent 35d3807904
commit effc7049a2
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/tracks/quad_graph.cpp
View File

@ -605,7 +605,7 @@ void QuadGraph::computeDistanceFromStart(unsigned int node, float new_distance)
if(current_distance<new_distance) if(current_distance<new_distance)
{ {
float delta = new_distance - current_distance; float delta = new_distance - current_distance;
updateDistancesForAllSuccessors(gn->getQuadIndex(), delta); updateDistancesForAllSuccessors(gn->getQuadIndex(), delta, 0);
} }
return; return;
} }
@ -634,9 +634,21 @@ void QuadGraph::computeDistanceFromStart(unsigned int node, float new_distance)
* distance from start. * distance from start.
* \param indx Index of the node for which to increase the distance. * \param indx Index of the node for which to increase the distance.
* \param delta Amount by which to increase the distance. * \param delta Amount by which to increase the distance.
* \param recursive_count Counts how often this function was called
* recursively in order to catch incorrect graphs that contain loops.
*/ */
void QuadGraph::updateDistancesForAllSuccessors(unsigned int indx, float delta) void QuadGraph::updateDistancesForAllSuccessors(unsigned int indx, float delta,
unsigned int recursive_count)
{ {
if(recursive_count>getNumNodes())
{
Log::error("QuadGraph",
"Quad graph contains a loop (without start node).");
Log::fatal("QuadGraph",
"Fix graph, check for directions of all shortcuts etc.");
}
recursive_count++;
GraphNode &g=getNode(indx); GraphNode &g=getNode(indx);
g.setDistanceFromStart(g.getDistanceFromStart()+delta); g.setDistanceFromStart(g.getDistanceFromStart()+delta);
for(unsigned int i=0; i<g.getNumberOfSuccessors(); i++) for(unsigned int i=0; i<g.getNumberOfSuccessors(); i++)
@ -653,7 +665,8 @@ void QuadGraph::updateDistancesForAllSuccessors(unsigned int indx, float delta)
if(g.getDistanceFromStart()+g.getDistanceToSuccessor(i) > if(g.getDistanceFromStart()+g.getDistanceToSuccessor(i) >
g_next.getDistanceFromStart()) g_next.getDistanceFromStart())
{ {
updateDistancesForAllSuccessors(g.getSuccessor(i), delta); updateDistancesForAllSuccessors(g.getSuccessor(i), delta,
recursive_count);
} }
} }
} // updateDistancesForAllSuccessors } // updateDistancesForAllSuccessors

4
src/tracks/quad_graph.hpp
View File

@ -123,7 +123,9 @@ public:
const video::SColor &fill_color const video::SColor &fill_color
=video::SColor(127, 255, 255, 255) ); =video::SColor(127, 255, 255, 255) );
void mapPoint2MiniMap(const Vec3 &xyz, Vec3 *out) const; void mapPoint2MiniMap(const Vec3 &xyz, Vec3 *out) const;
void updateDistancesForAllSuccessors(unsigned int indx, float delta); void updateDistancesForAllSuccessors(unsigned int indx,
float delta,
unsigned int count);
void setupPaths(); void setupPaths();
void computeChecklineRequirements(); void computeChecklineRequirements();
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------