iceflower/speed-dreams-code
1
0
Fork 0
forked from speed-dreams/speed-dreams-code
Code Pull requests Activity

Small bug fix

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

Former-commit-id: 3d960ae7797e4b402ab4f2318c7d7e5627ab9225
Former-commit-id: 2860612680d0b1d104f07eed770af91d1a366cb0
This commit is contained in:
wdbee 2012-03-25 12:42:33 +00:00
parent de2503cc2e
commit 1cf9dba1e3
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/drivers/simplix/src/unitdriver.cpp
View file

@ -2947,8 +2947,8 @@ void TDriver::EvaluateCollisionFlags(
bool Catching =
((OppInfo.CatchTime < ColTime) && OppInfo.GotFlags(F_COLLIDE))
|| ((OppInfo.CatchTime < CatTime) && OppInfo.GotFlags(F_CATCHING))
|| ((OppInfo.CatchAccTime < CacTime)
&& OppInfo.GotFlags(F_CATCHING_ACC));
|| ((OppInfo.CatchAccTime < CacTime) && OppInfo.GotFlags(F_CATCHING_ACC))
|| ((OppCar->CatchSpeed < 0.9 * oTargetSpeed) && (OppInfo.State.RelPos < 30));
if (!IgnoreTeamMate &&
(OppInfo.AvoidLatchTime > 0
@ -2965,10 +2965,10 @@ void TDriver::EvaluateCollisionFlags(
bool AvoidR = OppInfo.State.CarDistLat > 0 && SpaceL;
if (Catching)
OppInfo.AvoidLatchTime = fabs(Crv) < MaxSpdCrv ? 0.5 : 0.1;
// OppInfo.AvoidLatchTime = fabs(Crv) < MaxSpdCrv ? 1.0 : 0.5;
// OppInfo.AvoidLatchTime = fabs(Crv) < MaxSpdCrv ? 0.5 : 0.1;
OppInfo.AvoidLatchTime = fabs(Crv) < MaxSpdCrv ? 2.0 : 1.0;
if ((fabs(Crv) < MaxSpdCrv) || OppInfo.GotFlags(F_DANGEROUS) || (oCurrSpeed < 0.7 * oTargetSpeed))
if (fabs(Crv) < MaxSpdCrv)
{
if (!AvoidL && !AvoidR)
{
@ -2982,7 +2982,8 @@ void TDriver::EvaluateCollisionFlags(
Coll.OppsAhead |= F_LEFT;
Coll.MinLDist = MIN(OppInfo.State.CarAvgVelLong, Coll.MinLDist);
}
else if (AvoidR)
if (AvoidR)
{
Coll.OppsAhead |= F_RIGHT;
Coll.MinRDist = MIN(OppInfo.State.CarAvgVelLong, Coll.MinRDist);