From 0a3556496ebcace9385aca029cf5dc30202cde12 Mon Sep 17 00:00:00 2001 From: torcs-ng Date: Wed, 12 Aug 2015 22:12:55 +0000 Subject: [PATCH] - Update Shadow's driver git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@6070 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: e75e35bd8470add689d466525369b63944e80e73 Former-commit-id: 816c67a32ac3a8f6ce1f21d3c2eba78e8e059cea --- src/drivers/shadow/src/Driver.cpp | 6 +++--- src/drivers/shadow/src/Driver.h | 1 - src/drivers/shadow/src/Span.cpp | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/drivers/shadow/src/Driver.cpp b/src/drivers/shadow/src/Driver.cpp index cd1f1ae87..e8a05dd90 100644 --- a/src/drivers/shadow/src/Driver.cpp +++ b/src/drivers/shadow/src/Driver.cpp @@ -497,7 +497,7 @@ void TDriver::InitTrack( tTrack* pTrack, void* pCarHandle, void** ppCarParmHandl LogSHADOW.debug("Load track settings ....\n"); // get the private parameters now. - m_ScaleMuRain = GfParmGetNum(hCarParm, SECT_PRIV, PRV_RAIN_MU, NULL, m_ScaleMuRain); + m_ScaleMuRain = (double)(GfParmGetNum(hCarParm, SECT_PRIV, PRV_RAIN_MU, NULL, m_ScaleMuRain)); LogSHADOW.info("#Scale Mu Rain: %g\n", m_ScaleMuRain); m_cm.AERO = (int)GfParmGetNum(hCarParm, SECT_PRIV, PRV_AERO_MOD, 0, 0); @@ -510,8 +510,8 @@ void TDriver::InitTrack( tTrack* pTrack, void* pCarHandle, void** ppCarParmHandl m_cm.KZ_SCALE = GfParmGetNum(hCarParm, SECT_PRIV, PRV_KZ_SCALE, NULL, 0.43f); m_cm.BUMP_FACTOR = GfParmGetNum(hCarParm, SECT_PRIV, PRV_BUMP_FACTOR, NULL, 1.0); - m_cm.NEEDSINLONG = GfParmGetNum(hCarParm, SECT_PRIV, PRV_NEED_SIN, NULL, 0); - m_cm.USEDACCEXIT = GfParmGetNum(hCarParm, SECT_PRIV, PRV_USED_ACC, NULL, 0); + m_cm.NEEDSINLONG = (bool)(GfParmGetNum(hCarParm, SECT_PRIV, PRV_NEED_SIN, NULL, 0)); + m_cm.USEDACCEXIT = (bool)(GfParmGetNum(hCarParm, SECT_PRIV, PRV_USED_ACC, NULL, 0)); m_cm.BRAKESCALE = GfParmGetNum(hCarParm, SECT_PRIV, PRV_BRAKESCALE, NULL, 1.0); FACTORS.RemoveAll(); diff --git a/src/drivers/shadow/src/Driver.h b/src/drivers/shadow/src/Driver.h index 3be62c5a4..f0cc2eec1 100644 --- a/src/drivers/shadow/src/Driver.h +++ b/src/drivers/shadow/src/Driver.h @@ -431,7 +431,6 @@ private: double m_FuelNeeded; double m_RepairNeeded; - //LinearAttractor m_avoidX; //LinearAttractor m_avoidY; diff --git a/src/drivers/shadow/src/Span.cpp b/src/drivers/shadow/src/Span.cpp index 237f53820..65c09b2bb 100644 --- a/src/drivers/shadow/src/Span.cpp +++ b/src/drivers/shadow/src/Span.cpp @@ -54,7 +54,7 @@ bool Span::Overlaps( const Span& span ) const double newA = MX(a, span.a); double newB = MN(b, span.b); - return a < b; + return newA < newB; } bool Span::Contains( const Span& span ) const