speed-dreams/speed-dreams-code
speed-dreams/speed-dreams-code
7
1
Fork 3
Code Issues 8 Pull requests Projects Releases 1 Packages Wiki Activity Actions

Increment skipcount in usr_36GP driver and fix some other related bugs

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

Former-commit-id: c00d71e8ea80b77a7eb392bb0be58305ee90dc82
Former-commit-id: 97113593be3e476906302f58b9050893d23f5621
This commit is contained in:
martkelder 2009-09-28 13:33:21 +00:00
parent 705b103cf1
commit 36d225962c
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/drivers/usr_36GP/driver.cpp
View file

@ -524,7 +524,7 @@ void Driver::LoadDAT( tSituation *s, char *carname, char *trackname )
// Start a new race. // Start a new race.
void Driver::newRace(tCarElt* car, tSituation *s) void Driver::newRace(tCarElt* car, tSituation *s)
{ {
deltaTime = (float) RCM_MAX_DT_ROBOTS; deltaTime = (float) RCM_MAX_DT_ROBOTS*SKIPLIMIT;
MAX_UNSTUCK_COUNT = int(UNSTUCK_TIME_LIMIT/deltaTime); MAX_UNSTUCK_COUNT = int(UNSTUCK_TIME_LIMIT/deltaTime);
OVERTAKE_OFFSET_INC = OVERTAKE_OFFSET_SPEED*deltaTime; OVERTAKE_OFFSET_INC = OVERTAKE_OFFSET_SPEED*deltaTime;
random_seed = 0; random_seed = 0;
@ -850,9 +850,8 @@ void Driver::drive(tSituation *s)
laststeer = car->_steerCmd; laststeer = car->_steerCmd;
memset(&car->ctrl, 0, sizeof(tCarCtrl)); memset(&car->ctrl, 0, sizeof(tCarCtrl));
if (skipcount > 0) if (++skipcount > 1)
{ {
skipcount++;
if (skipcount >= SKIPLIMIT) if (skipcount >= SKIPLIMIT)
skipcount = 0; skipcount = 0;
@ -916,6 +915,12 @@ void Driver::drive(tSituation *s)
lastaccel = car->_accelCmd; lastaccel = car->_accelCmd;
lastmode = mode; lastmode = mode;
prevleft = car->_trkPos.toLeft; prevleft = car->_trkPos.toLeft;
cmd_accel = car->_accelCmd;
cmd_brake = car->_brakeCmd;
cmd_steer = car->_steerCmd;
cmd_clutch = car->_clutchCmd;
cmd_gear = car->_gearCmd;
} }
@ -1766,7 +1771,7 @@ float Driver::getClutch()
if (car->_gear != car->_gearCmd && car->_gearCmd < MaxGear) if (car->_gear != car->_gearCmd && car->_gearCmd < MaxGear)
clutchtime = maxtime; clutchtime = maxtime;
if (clutchtime > 0.0f) if (clutchtime > 0.0f)
clutchtime -= (float) (RCM_MAX_DT_ROBOTS * (0.02f + ((float) car->_gearCmd / 8.0f))); clutchtime -= (float) (RCM_MAX_DT_ROBOTS * SKIPLIMIT * (0.02f + ((float) car->_gearCmd / 8.0f)));
return 2.0f * clutchtime; return 2.0f * clutchtime;
} else { } else {
float drpm = car->_enginerpm - car->_enginerpmRedLine/2.0f; float drpm = car->_enginerpm - car->_enginerpmRedLine/2.0f;
@ -1778,7 +1783,7 @@ float Driver::getClutch()
clutchtime = 0.0f; clutchtime = 0.0f;
float clutcht = (ctlimit - clutchtime) / ctlimit; float clutcht = (ctlimit - clutchtime) / ctlimit;
if (car->_gear == 1 && car->_accelCmd > 0.0f) { if (car->_gear == 1 && car->_accelCmd > 0.0f) {
clutchtime += (float) RCM_MAX_DT_ROBOTS; clutchtime += (float) RCM_MAX_DT_ROBOTS * SKIPLIMIT;
} }
if (car->_gearCmd == 1 || drpm > 0) { if (car->_gearCmd == 1 || drpm > 0) {
@ -1947,7 +1952,7 @@ vec2f Driver::getTargetPoint(bool use_lookahead, double targetoffset)
lookahead *= LookAhead; lookahead *= LookAhead;
// Prevent "snap back" of lookahead on harsh braking. // Prevent "snap back" of lookahead on harsh braking.
float cmplookahead = oldlookahead - (car->_speed_x*RCM_MAX_DT_ROBOTS)*0.65f;//0.55f; float cmplookahead = oldlookahead - (car->_speed_x*RCM_MAX_DT_ROBOTS*SKIPLIMIT)*0.65f;//0.55f;
if (lookahead < cmplookahead) { if (lookahead < cmplookahead) {
lookahead = cmplookahead; lookahead = cmplookahead;
} }