diff --git a/src/drivers/usr/src/MuFactors.cpp b/src/drivers/usr/src/MuFactors.cpp index 166151877..58f917ba1 100755 --- a/src/drivers/usr/src/MuFactors.cpp +++ b/src/drivers/usr/src/MuFactors.cpp @@ -19,6 +19,10 @@ #include #include +#include + +extern GfLogger* PLogUSR; +#define LogUSR (*PLogUSR) MuFactors::MuFactors() { @@ -48,7 +52,7 @@ void MuFactors::read(const std::string& datadir, const std::string& trackname) mSect.push_back(sect); mMinMuFactor = 1.0; printMuFactors(); - std::cout << "readMuFactors(): data file " << datFile << " not found, using default factor" << std::endl; + LogUSR.info("Couldn't load : %s, using default factor\n", datFile.c_str()); } } diff --git a/src/drivers/usr/src/PathMargins.cpp b/src/drivers/usr/src/PathMargins.cpp index 9689b3b2b..111b4d10c 100755 --- a/src/drivers/usr/src/PathMargins.cpp +++ b/src/drivers/usr/src/PathMargins.cpp @@ -18,7 +18,10 @@ #include "PathMargins.h" #include -#include +#include + +extern GfLogger* PLogUSR; +#define LogUSR (*PLogUSR) PathMargins::PathMargins() { @@ -45,7 +48,7 @@ void PathMargins::read(const std::string &datafile) sect.left = 1.2; sect.right = 1.2; mPathMargin.push_back(sect); - std::cout << "readPathMargins(): data file " << datafile << " not found, using default margins" << std::endl; + LogUSR.info("Couldn't load : %s, using default margins\n", datafile.c_str()); } } diff --git a/src/drivers/usr/src/pit.cpp b/src/drivers/usr/src/pit.cpp index 6e1f8fe6b..615bf0f55 100755 --- a/src/drivers/usr/src/pit.cpp +++ b/src/drivers/usr/src/pit.cpp @@ -27,6 +27,7 @@ Pit::Pit() : mTeamCar(NULL), mPit(NULL), mPitInfo(NULL), + mTiresChangeTime(30.0), mMaxDamage(7000.0), mMaxDamageDist(30000.0), mPreEntryMargin(100.0) @@ -39,7 +40,11 @@ void Pit::init(const tTrack* track, const tSituation* situation, MyCar* car, int void* handle = NULL; std::string tmpstr = std::string(GetLocalDir()) + "config/raceman/endrace.xml"; handle = GfParmReadFile(tmpstr.c_str(), GFPARM_RMODE_STD); - mTiresChangeTime = GfParmGetNum(handle, "Race", "all tires change time", (char*)NULL, 30.0); + if (handle) + { + mTiresChangeTime = GfParmGetNum(handle, "Race", "all tires change time", (char*)NULL, 30.0); + GfParmReleaseHandle(handle); + } if (pitdamage) {