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

Replaced while(1) loop with a for loop to definitely avoid infinite loops

Browse Source 
(which fixes bug 3113988).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6715 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2010-11-24 21:55:19 +00:00
parent 8c129ccde6
commit f23a247fd2
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/karts/controller/default_ai_controller.cpp
View File

@ -889,14 +889,12 @@ void DefaultAIController::findNonCrashingPoint(Vec3 *result)
Vec3 direction;
Vec3 step_track_coord;
float distance;
int steps;
int count=0;
//We exit from the function when we have found a solution
while( 1 )
// The original while(1) loop is replaced with a for loop to avoid
// infinite loops (which we had once or twice). Usually the number
// of iterations in the while loop is less than 7.
for(unsigned int i=0; i<100; i++)
{
count ++;
//target_sector is the sector at the longest distance that we can drive
//to without crashing with the track.
target_sector = m_next_node_index[sector];
@ -906,9 +904,14 @@ void DefaultAIController::findNonCrashingPoint(Vec3 *result)
- m_kart->getXYZ();
float len=direction.length_2d();
steps = int( len / m_kart_length );
unsigned int steps = unsigned int( len / m_kart_length );
if( steps < 3 ) steps = 3;
// That shouldn't happen, but since we had one instance of
// STK hanging, add an upper limit here (usually it's at most
// 20 steps)
if( steps>1000) steps = 1000;
//Protection against having vel_normal with nan values
if(len>0.0f) {
direction*= 1.0f/len;
@ -923,7 +926,7 @@ void DefaultAIController::findNonCrashingPoint(Vec3 *result)
m_quad_graph->spatialToTrack(&step_track_coord, step_coord,
sector );
distance = fabsf(step_track_coord[0]);
float distance = fabsf(step_track_coord[0]);
//If we are outside, the previous sector is what we are looking for
if ( distance + m_kart_width * 0.5f
@ -934,7 +937,8 @@ void DefaultAIController::findNonCrashingPoint(Vec3 *result)
}
}
sector = target_sector;
}
} // for i<100
*result = m_quad_graph->getQuad(sector).getCenter();
} // findNonCrashingPoint
//-----------------------------------------------------------------------------