From 7631e22f5d15952db61e04cc459d6168621de9fa Mon Sep 17 00:00:00 2001 From: torcs-ng Date: Mon, 6 Jul 2020 00:36:41 +0000 Subject: [PATCH] - update shadow's driver git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@7149 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: 5344ff8ee8ec632b7f960dd0eab34dc461645cd6 Former-commit-id: 0829ed1e98056856909ac608f9e2f23ff740ce2a --- src/drivers/shadow/src/Driver.cpp | 14 ++++++-------- src/drivers/shadow/src/Strategy.cpp | 9 +++++++-- src/drivers/shadow/src/Stuck.cpp | 4 ++-- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/drivers/shadow/src/Driver.cpp b/src/drivers/shadow/src/Driver.cpp index ff8a25b1f..c2d6a304b 100644 --- a/src/drivers/shadow/src/Driver.cpp +++ b/src/drivers/shadow/src/Driver.cpp @@ -236,6 +236,7 @@ void Driver::InitTrack( strncpy(m_carName, GfParmGetStr(pCarHandle, path, key, ""), 99); m_carName[99] = '\0'; char* p = strrchr(m_carName, '.'); + if( p ) *p = '\0'; @@ -255,10 +256,7 @@ void Driver::InitTrack( // const char* raceTypeStr[] = { "practice", "qualify", "race" }; - int raceType = pS->raceInfo.type; - - //if( raceType == RM_TYPE_PRACTICE && (pS->raceInfo.totLaps == 3 || pS->raceInfo.totLaps == 10) ) - // raceType = RM_TYPE_QUALIF; + unsigned int raceType = pS->raceInfo.type; LogSHADOW.debug(" # Shadow Race type = %s \n", raceTypeStr[raceType]); @@ -283,13 +281,13 @@ void Driver::InitTrack( snprintf( buf, sizeof(buf), "%sdrivers/%s/%s/default.xml", GfDataDir(), MyBotName, m_carName); hCarParm = MergeParamFile(hCarParm, buf, hCarParm != pCarHandle); - LogSHADOW.debug("PATH = %s \n", buf); + LogSHADOW.info("PATH = %s \n", buf); // override params for car type on track of specific race type and driver. snprintf( buf, sizeof(buf), "%sdrivers/%s/%s/%s-%d.xml", GfDataDir(), MyBotName, m_carName, m_trackName, weathercode); hCarParm = MergeParamFile(hCarParm, buf, hCarParm != pCarHandle); - LogSHADOW.debug("PATH = %s \n", buf); + LogSHADOW.info("PATH = %s \n", buf); } else { @@ -297,13 +295,13 @@ void Driver::InitTrack( snprintf( buf, sizeof(buf), "%sdrivers/%s/%s/default.xml", GfDataDir(), MyBotName, m_carName); hCarParm = MergeParamFile(hCarParm, buf, hCarParm != pCarHandle); - LogSHADOW.info("PATH = %s \n", buf); + LogSHADOW.info(" # Loaded default = %s \n", buf); // override params for car type on track of specific race type and driver. snprintf( buf, sizeof(buf), "%sdrivers/%s/%s/%s.xml", GfDataDir(), MyBotName, m_carName, m_trackName); hCarParm = MergeParamFile(hCarParm, buf, hCarParm != pCarHandle); - LogSHADOW.info("PATH = %s \n", buf); + LogSHADOW.info(" # Loaded = %s \n", buf); } // setup the car param handle to be returned. diff --git a/src/drivers/shadow/src/Strategy.cpp b/src/drivers/shadow/src/Strategy.cpp index 1c190e571..5538b430a 100644 --- a/src/drivers/shadow/src/Strategy.cpp +++ b/src/drivers/shadow/src/Strategy.cpp @@ -143,9 +143,14 @@ void Strategy::Process( CarElt* pCar, TeamInfo::Item* pTeamInfo ) damagePerM = m_totalDamage / pCar->_distRaced; if(m_HasTYC) + { tyreWearPerM = (1.0 - m_lastTyreWear) / pCar->_distRaced; - - LogSHADOW.debug(" # Fuel per meter = %.6f - Damage per meter = %.1f - Wear per meter = %.8f\n", fuelPerM, damagePerM, tyreWearPerM); + LogSHADOW.debug(" # Fuel per meter = %.6f - Damage per meter = %.1f - Wear per meter = %.8f\n", fuelPerM, damagePerM, tyreWearPerM); + } + else + { + LogSHADOW.debug(" # Fuel per meter = %.6f - Damage per meter = %.1f\n", fuelPerM, damagePerM); + } } // diff --git a/src/drivers/shadow/src/Stuck.cpp b/src/drivers/shadow/src/Stuck.cpp index 4fa339cf8..c915d63cc 100644 --- a/src/drivers/shadow/src/Stuck.cpp +++ b/src/drivers/shadow/src/Stuck.cpp @@ -35,9 +35,9 @@ const float Stuck::delta8_t[8] = {1.0f/Stuck::SPD, 1.0f/Stuck::SPD * 1.414f, 1.0f/Stuck::SPD, 1.0f/Stuck::SPD * 1.414f, 1.0f/Stuck::SPD, 1.0f/Stuck::SPD * 1.414f}; -const float Stuck::delta64_t[64] = +const float Stuck::delta64_t[64] = { - 1.0f/Stuck::SPD * 1.000f, 1.0f/Stuck::SPD * 1.050f, 1.0f/Stuck::SPD * 1.100f, 1.0f/Stuck::SPD * 1.150f, + 1.0f/Stuck::SPD * 1.000f, 1.0f/Stuck::SPD * 1.050f, 1.0f/Stuck::SPD * 1.100f, 1.0f/Stuck::SPD * 1.150f, 1.0f/Stuck::SPD * 1.500f, 1.0f/Stuck::SPD * 1.480f, 1.0f/Stuck::SPD * 1.460f, 1.0f/Stuck::SPD * 1.440f, 1.0f/Stuck::SPD * 1.414f, 1.0f/Stuck::SPD * 1.440f, 1.0f/Stuck::SPD * 1.460f, 1.0f/Stuck::SPD * 1.480f, 1.0f/Stuck::SPD * 1.500f, 1.0f/Stuck::SPD * 1.150f, 1.0f/Stuck::SPD * 1.100f, 1.0f/Stuck::SPD * 1.050f,