speed-dreams/speed-dreams-code
6
1
Fork 1
Code Issues 9 Pull requests Projects Releases Packages Wiki Activity Actions

- update shadow's driver

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

Former-commit-id: a337d0f140e06feca840bea1306257cf5a367275
Former-commit-id: f36b21297b149fded70b4c57aa44ddcf356b9573
This commit is contained in:
torcs-ng 2019-05-10 23:01:48 +00:00
parent bb11e1b1fa
commit c31eed3edd
2 changed files with 2014 additions and 2021 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/drivers/shadow/src/Driver.cpp
View file

@ -45,7 +45,6 @@ static const int BUFSIZE = 256;
//==========================================================================*
// Statics
//--------------------------------------------------------------------------*
int TDriver::RobotType = 0;
bool TDriver::AdvancedParameters = false; // Advanced parameters
bool TDriver::UseOldSkilling = false; // Use old skilling
bool TDriver::UseSCSkilling = false; // Use supercar skilling
@ -3328,8 +3327,7 @@ double TDriver::CalcFriction_shadow_REF(const double Crv)
//--------------------------------------------------------------------------*
void TDriver::CalcSkill()
{
if (Skilling && (RM_TYPE_PRACTICE != m_Situation->_raceType)
&& m_Strategy->OutOfPitlane())
if (Skilling && (RM_TYPE_PRACTICE != m_Situation->_raceType) && m_Strategy->OutOfPitlane())
{
if ((SkillAdjustTimer == -1.0) || (CurrSimTime - SkillAdjustTimer > SkillAdjustLimit))
{

7
src/drivers/shadow/src/Driver.h
View file

@ -117,10 +117,6 @@ class SimpleStrategy;
//==========================================================================*
// Speed Dreams-Interface
//--------------------------------------------------------------------------*
static const int MAX_NBBOTS = 100;
enum { SHADOW_TRB1=1, SHADOW_SC, SHADOW_SRW, SHADOW_LS1, SHADOW_LS2, SHADOW_36GP,
SHADOW_67GP, SHADOW_RS, SHADOW_LP1, SHADOW_MPA1, SHADOW_MPA11, SHADOW_MPA12 };
class TDriver
{
@ -199,7 +195,6 @@ public:
void EndRace(tSituation* s );
void Shutdown();
static int NBBOTS; // Nbr of cars
double CurrSimTime; // Current simulation time
double Frc; // Friction coefficient
//bool UseBrakeLimit; // Enable/disable brakelimit
@ -321,7 +316,6 @@ private:
};
private:
Shared* m_pShared;
MyTrack m_track;
OptimisedPath m_path[N_PATHS];
PitPath m_pitPath[N_PATHS];
@ -450,6 +444,7 @@ private:
double m_lastAng;
SimpleStrategy *m_Strategy; // Pit strategy
Shared* m_pShared;
bool m_CrvComp; // Crv compensation
float clutchtime; // Clutch timer.