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

Fixed NAN crash, which could happen because m_curve_center was not

Browse Source 
initialised. If m_current_track_direction was UNDEFINED, 
m_curve_center was actually used.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11486 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk
2012-08-07 23:31:35 +00:00
parent 0a8ddf3a1f
commit bb0219fa42
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/karts/controller/skidding_ai.cpp
View File

@@ -182,6 +182,7 @@ void SkiddingAI::reset()
m_kart_behind = NULL;
m_distance_behind = 0.0f;
m_current_curve_radius = 0.0f;
m_curve_center = Vec3(0,0,0);
m_current_track_direction = GraphNode::DIR_STRAIGHT;
AIBaseController::reset();
@@ -1337,7 +1338,8 @@ bool SkiddingAI::doSkid(float steer_fraction)
}
// No skidding on straights
if(m_current_track_direction==GraphNode::DIR_STRAIGHT)
if(m_current_track_direction==GraphNode::DIR_STRAIGHT ||
m_current_track_direction==GraphNode::DIR_UNDEFINED )
{
#ifdef DEBUG
if(m_controls->m_skid && m_ai_debug)
@@ -1349,10 +1351,6 @@ bool SkiddingAI::doSkid(float steer_fraction)
return false;
}
assert(!isnan(m_curve_center.getX()));
assert(!isnan(m_curve_center.getY()));
assert(!isnan(m_curve_center.getZ()));
const float MIN_SKID_SPEED = 5.0f;
const QuadGraph *qg = QuadGraph::get();
Vec3 last_xyz = qg->getNode(m_last_direction_node).getCenter();
@@ -1549,9 +1547,6 @@ void SkiddingAI::determineTurnRadius(const Vec3 &start,
irr::core::vector2df result;
if(line1.intersectWith(line2, result, /*checkOnlySegments*/false))
{
assert(!isnan(result.X));
assert(!isnan(start.getY()));
assert(!isnan(result.Y));
*center = Vec3(result.X, start.getY(), result.Y);
*radius = (start - *center).length();
}
@@ -1560,9 +1555,6 @@ void SkiddingAI::determineTurnRadius(const Vec3 &start,
// No intersection. In this case assume that the two points are
// on a semicircle, in which case the center is at 0.5*(start+end):
*center = 0.5f*(start+end);
assert(!isnan(center->getX()));
assert(!isnan(center->getY()));
assert(!isnan(center->getZ()));
*radius = 0.5f*(end-start).length();
}
return;