USR_SC: fixes to the "getting unstuck" code

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@892 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 4f75a2d3235c03a429ecfaf4a4aa701a6114b24f
Former-commit-id: 3274673306e2cde2c16c9fab4ec239b75fa0573f
This commit is contained in:
andrewsumner 2009-04-20 01:01:08 +00:00
parent 542e49204a
commit eba916b312

View file

@ -1836,7 +1836,7 @@ float Driver::getOffset()
//double incspeed = MIN(40.0, MAX(30.0, getSpeed()));
//double incfactor = (MAX_INC_FACTOR*0.5 - MIN(incspeed/10, MAX_INC_FACTOR*0.5-0.5)) * 60 * IncFactor;
double incspeed = MIN(60.0, MAX(40.0, getSpeed())) - 10.0;
double incfactor = (MAX_INC_FACTOR - MIN(fabs(incspeed)/MAX_INC_FACTOR, (MAX_INC_FACTOR - 1.0f))) * (10.0f + MAX(0.0, (CA-1.9)*10));// * MAX(0.4, 1.0 - (fabs(rldata->aInverse)*3));
double incfactor = (MAX_INC_FACTOR - MIN(fabs(incspeed)/MAX_INC_FACTOR, (MAX_INC_FACTOR - 1.0f))) * (10.0f + MAX(0.0, (CA-1.9)*10)) * IncFactor;
//double rgtinc = incfactor * MIN(3.0, MAX(0.6, 1.0 + rldata->mInverse * (rldata->mInverse<0.0?-5:100)));
//double lftinc = incfactor * MIN(3.0, MAX(0.6, 1.0 - rldata->mInverse * (rldata->mInverse>0.0?-5:100)));