diff --git a/src/drivers/dandroid/src/ClothoidPath.h b/src/drivers/dandroid/src/ClothoidPath.h index d882e2bb8..f659b7d1a 100644 --- a/src/drivers/dandroid/src/ClothoidPath.h +++ b/src/drivers/dandroid/src/ClothoidPath.h @@ -36,7 +36,7 @@ public: double factor; Options() : maxL(999), maxR(999), margin(1.0), factor(1.005) {} - Options( double ml = 999, double mr = 999, double ma = 1.0, double fa = 1.005 ) : maxL(ml), maxR(mr), margin(ma), factor(fa) {} + Options( double ml /* = 999 */, double mr = 999, double ma = 1.0, double fa = 1.005 ) : maxL(ml), maxR(mr), margin(ma), factor(fa) {} }; public: diff --git a/src/drivers/dandroid/src/MyTrack.cpp b/src/drivers/dandroid/src/MyTrack.cpp index ae1b5fff9..6f0a5f350 100644 --- a/src/drivers/dandroid/src/MyTrack.cpp +++ b/src/drivers/dandroid/src/MyTrack.cpp @@ -150,7 +150,7 @@ double MyTrack::CalcPos( double x, double y, const Seg* hint, bool sides ) const pTrackSeg = hint->pSeg; tTrkLocPos pos; - RtTrackGlobal2Local( pTrackSeg, x, y, &pos, sides ); + RtTrackGlobal2Local( pTrackSeg, (tdble) x, (tdble) y, &pos, sides ); double dist = RtGetDistFromStart2(&pos); return dist; } diff --git a/src/drivers/dandroid/src/danpath.cpp b/src/drivers/dandroid/src/danpath.cpp index 15727c1f0..bb2eb28bb 100644 --- a/src/drivers/dandroid/src/danpath.cpp +++ b/src/drivers/dandroid/src/danpath.cpp @@ -207,7 +207,7 @@ double DanLine::calcYaw(DanPoint danpoint) double DanLine::calcTrackYaw(DanPoint danpoint, double& trackyaw) { tTrkLocPos locpos; - RtTrackGlobal2Local(myseg, danpoint.pos.x, danpoint.pos.y, &locpos, TR_LPOS_MAIN); + RtTrackGlobal2Local(myseg, (tdble) danpoint.pos.x, (tdble) danpoint.pos.y, &locpos, TR_LPOS_MAIN); myseg = locpos.seg; trackyaw = RtTrackSideTgAngleL(&locpos); return true; @@ -217,7 +217,7 @@ double DanLine::calcTrackYaw(DanPoint danpoint, double& trackyaw) bool DanLine::fromStart(Vec2d pos, double& fromstart) { tTrkLocPos locpos; - RtTrackGlobal2Local(myseg, pos.x, pos.y, &locpos, TR_LPOS_MAIN); + RtTrackGlobal2Local(myseg, (tdble) pos.x, (tdble) pos.y, &locpos, TR_LPOS_MAIN); myseg = locpos.seg; fromstart = RtGetDistFromStart2(&locpos); return true; @@ -227,7 +227,7 @@ bool DanLine::fromStart(Vec2d pos, double& fromstart) bool DanLine::toMiddle(Vec2d pos, double& tomiddle) { tTrkLocPos locpos; - RtTrackGlobal2Local(myseg, pos.x, pos.y, &locpos, TR_LPOS_MAIN); + RtTrackGlobal2Local(myseg, (tdble) pos.x, (tdble) pos.y, &locpos, TR_LPOS_MAIN); myseg = locpos.seg; tomiddle = locpos.toMiddle; return true; diff --git a/src/drivers/dandroid/src/driver.cpp b/src/drivers/dandroid/src/driver.cpp index aa379b60b..ac488f3e3 100644 --- a/src/drivers/dandroid/src/driver.cpp +++ b/src/drivers/dandroid/src/driver.cpp @@ -128,9 +128,9 @@ void TDriver::InitTrack(PTrack Track, PCarHandle CarHandle, PCarSettings *CarPar mDriverMsgCarIndex = 0; mFRONTCOLL_MARGIN = 4.0; } else { - mLearning = GfParmGetNum(handle, "private", "learning", (char*)NULL, 0.0); + mLearning = GfParmGetNum(handle, "private", "learning", (char*)NULL, 0.0) != 0; //mLearning = 1; - mTestpitstop = GfParmGetNum(handle, "private", "test pitstop", (char*)NULL, 0.0); + mTestpitstop = GfParmGetNum(handle, "private", "test pitstop", (char*)NULL, 0.0) != 0; //mTestpitstop = 1; mTestLine = (int)GfParmGetNum(handle, "private", "test line", (char*)NULL, 0.0); mDriverMsgLevel = (int)GfParmGetNum(handle, "private", "driver message", (char*)NULL, 0.0); @@ -156,7 +156,7 @@ void TDriver::InitTrack(PTrack Track, PCarHandle CarHandle, PCarSettings *CarPar std::sprintf(buffer, "drivers/%s/%s/default.xml", MyBotName, mCarType.c_str()); *CarParmHandle = GfParmReadFile(buffer, GFPARM_RMODE_STD); } - mFuelPerMeter = GfParmGetNum(*CarParmHandle, "private", "fuelpermeter", (char*)NULL, 0.001); + mFuelPerMeter = GfParmGetNum(*CarParmHandle, "private", "fuelpermeter", (char*)NULL, 0.001f); // Set initial fuel double distance = Situation->_totLaps * mTrack->length; @@ -168,7 +168,7 @@ void TDriver::InitTrack(PTrack Track, PCarHandle CarHandle, PCarSettings *CarPar if (mLearning) { mFuelStart = mTankvol; } - GfParmSetNum(*CarParmHandle, SECT_CAR, PRM_FUEL, (char*)NULL, mFuelStart); + GfParmSetNum(*CarParmHandle, SECT_CAR, PRM_FUEL, (char*)NULL, (tdble) mFuelStart); // Get skill level handle = NULL; @@ -443,11 +443,12 @@ void TDriver::calcTarget() void TDriver::setControls() { - oCar->_steerCmd = getSteer(); + oCar->_steerCmd = (tdble) getSteer(); oCar->_gearCmd = getGear(); - oCar->_clutchCmd = getClutch(); // must be after gear - oCar->_brakeCmd = filterABS(getBrake(mMaxspeed)); - oCar->_accelCmd = mAccel = filterTCLSideSlip(filterTCL(getAccel(mMaxspeed))); // must be after brake + oCar->_clutchCmd = (tdble) getClutch(); // must be after gear + oCar->_brakeCmd = (tdble) filterABS(getBrake(mMaxspeed)); + mAccel = filterTCLSideSlip(filterTCL(getAccel(mMaxspeed))); // must be after brake + oCar->_accelCmd = (tdble) mAccel; oCar->_lightCmd = RM_LIGHT_HEAD1 | RM_LIGHT_HEAD2; } @@ -731,7 +732,7 @@ int TDriver::getGear() if (oCurrSimTime < 0.5) { // For the start - shifttime = 0.0; + shifttime = 0; } if (mTenthTimer) { if (mShiftTimer < shifttime) { @@ -1307,14 +1308,14 @@ void TDriver::readPrivateSection() mPITENTRYMARGIN = GfParmGetNum(oCar->_carHandle, "private", "pitentrymargin", (char*)NULL, 200.0); mPITENTRYSPEED = GfParmGetNum(oCar->_carHandle, "private", "pitentryspeed", (char*)NULL, 25.0); mPITEXITSPEED = GfParmGetNum(oCar->_carHandle, "private", "pitexitspeed", (char*)NULL, 25.0); - mSPEEDFACTOR = GfParmGetNum(oCar->_carHandle, "private", "speedfactor", (char*)NULL, 0.6); - mTARGETFACTOR = GfParmGetNum(oCar->_carHandle, "private", "targetfactor", (char*)NULL, 0.3); + mSPEEDFACTOR = GfParmGetNum(oCar->_carHandle, "private", "speedfactor", (char*)NULL, 0.6f); + mTARGETFACTOR = GfParmGetNum(oCar->_carHandle, "private", "targetfactor", (char*)NULL, 0.3f); mTARGETWALLDIST = GfParmGetNum(oCar->_carHandle, "private", "targetwalldist", (char*)NULL, 0.0); - mTRACTIONCONTROL = GfParmGetNum(oCar->_carHandle, "private", "tractioncontrol", (char*)NULL, 1.0); + mTRACTIONCONTROL = GfParmGetNum(oCar->_carHandle, "private", "tractioncontrol", (char*)NULL, 1.0) != 0; mMAXLEFT = GfParmGetNum(oCar->_carHandle, "private", "maxleft", (char*)NULL, 10.0); mMAXRIGHT = GfParmGetNum(oCar->_carHandle, "private", "maxright", (char*)NULL, 10.0); mMARGIN = GfParmGetNum(oCar->_carHandle, "private", "margin", (char*)NULL, 1.5); - mCLOTHFACTOR = GfParmGetNum(oCar->_carHandle, "private", "clothoidfactor", (char*)NULL, 1.005); + mCLOTHFACTOR = GfParmGetNum(oCar->_carHandle, "private", "clothoidfactor", (char*)NULL, 1.005f); mSEGLEN = GfParmGetNum(oCar->_carHandle, "private", "seglen", (char*)NULL, 3.0); } @@ -1870,8 +1871,8 @@ void TDriver::calcGlobalTarget() mGlobalTarget = mPath[mDrvPath].tarpos.pos; } else { tTrkLocPos target_local; - RtTrackGlobal2Local(oCar->_trkPos.seg, mPath[mDrvPath].tarpos.pos.x, mPath[mDrvPath].tarpos.pos.y, &target_local, TR_LPOS_MAIN); - target_local.toMiddle = mTargetToMiddle; + RtTrackGlobal2Local(oCar->_trkPos.seg, (tdble) mPath[mDrvPath].tarpos.pos.x, (tdble) mPath[mDrvPath].tarpos.pos.y, &target_local, TR_LPOS_MAIN); + target_local.toMiddle = (tdble) mTargetToMiddle; tdble x, y; RtTrackLocal2Global(&target_local, &x, &y, TR_TOMIDDLE); mGlobalTarget.x = x; diff --git a/src/drivers/dandroid/src/pit.cpp b/src/drivers/dandroid/src/pit.cpp index 9b78698a8..0aa3502af 100644 --- a/src/drivers/dandroid/src/pit.cpp +++ b/src/drivers/dandroid/src/pit.cpp @@ -309,6 +309,7 @@ double Pit::getSideDist() void Pit::pitCommand() { car->_pitRepair = getRepair(); - car->_pitFuel = lastpitfuel = getFuel(); + lastpitfuel = getFuel(); + car->_pitFuel = (tdble) lastpitfuel; setPitstop(false); } diff --git a/src/drivers/shadow/src/MyTrack.cpp b/src/drivers/shadow/src/MyTrack.cpp index 20c63b4dd..8d7539ba5 100644 --- a/src/drivers/shadow/src/MyTrack.cpp +++ b/src/drivers/shadow/src/MyTrack.cpp @@ -88,15 +88,15 @@ void MyTrack::NewTrack( tTrack* pNewTrack, bool pit, SideMod* pSideMod ) tsend = pseg->lgfromstart + pseg->length; } - const double MIN_MU = pseg->surface->kFriction * 0.8; - const double MAX_ROUGH = MX(0.005, pseg->surface->kRoughness * 1.2); - const double MAX_RESIST = MX(0.02, pseg->surface->kRollRes * 1.2); +// const double MIN_MU = pseg->surface->kFriction * 0.8; +// const double MAX_ROUGH = MX(0.005, pseg->surface->kRoughness * 1.2); +// const double MAX_RESIST = MX(0.02, pseg->surface->kRollRes * 1.2); // GfOut( " ### segDist %g tsend %g\n", // segDist, tsend ); - double t = (segDist - pseg->lgfromstart) / pseg->length; - double width = pseg->startWidth + (pseg->endWidth - pseg->startWidth) * t; +// double t = (segDist - pseg->lgfromstart) / pseg->length; +// double width = pseg->startWidth + (pseg->endWidth - pseg->startWidth) * t; m_pSegs[i].segDist = segDist; m_pSegs[i].pSeg = pseg; @@ -223,9 +223,9 @@ void MyTrack::NewTrack( tTrack* pNewTrack, bool pit, SideMod* pSideMod ) pSide->surface->kRollRes > MAX_RESIST || fabs(pSide->Kzw - SLOPE) > 0.005 ) { - bool inner = - s == TR_SIDE_LFT && pseg->type == TR_LFT || - s == TR_SIDE_RGT && pseg->type == TR_RGT; +// bool inner = +// s == TR_SIDE_LFT && pseg->type == TR_LFT || +// s == TR_SIDE_RGT && pseg->type == TR_RGT; w = 0;//inner ? MN(w, 0.5) : 0; done = true; } @@ -391,7 +391,7 @@ double MyTrack::CalcPos( double x, double y, const Seg* hint, bool sides ) const pTrackSeg = hint->pSeg; tTrkLocPos pos; - RtTrackGlobal2Local( pTrackSeg, x, y, &pos, sides ); + RtTrackGlobal2Local( pTrackSeg, (tdble) x, (tdble)y, &pos, sides ); double dist = RtGetDistFromStart2(&pos); return dist; } diff --git a/src/drivers/shadow/src/PitPath.cpp b/src/drivers/shadow/src/PitPath.cpp index 4db8c2d1b..6ad349d0d 100644 --- a/src/drivers/shadow/src/PitPath.cpp +++ b/src/drivers/shadow/src/PitPath.cpp @@ -92,7 +92,7 @@ void PitPath::MakePath( CarElt* pCar, LinePath* pBasePath, const CarModel& cm, d y[6] = pi.offs; s[6] = -tan(pi.oang - m_pTrack->CalcForwardAngle(m_pitExitPos)); - float sign = (pPitInfo->side == TR_LFT) ? -1.0 : 1.0; + float sign = (pPitInfo->side == TR_LFT) ? -1.0f : 1.0f; {for( int i = 1; i < NPOINTS - 1; i++ ) { y[i] = fabs(pPitInfo->driversPits->pos.toMiddle) - pPitInfo->width; diff --git a/src/drivers/shadow/src/Strategy.cpp b/src/drivers/shadow/src/Strategy.cpp index e3c8d5bd1..f32566b6f 100644 --- a/src/drivers/shadow/src/Strategy.cpp +++ b/src/drivers/shadow/src/Strategy.cpp @@ -78,7 +78,7 @@ void SimpleStrategy::setFuelAtRaceStart(tTrack* t, void **carParmHandle, tSituat LogSHADOW.info("Strategy max fuel = %.2f\n", maxFuel); FuelperMeters = GfParmGetNum(*carParmHandle, SECT_PRIV, PRV_FUELPERMETERS, (char*)NULL, (tdble) MAX_FUEL_PER_METER); LogSHADOW.info("Strategy fuel per meters = %.5f\n", FuelperMeters); - fuelPerLap = TrackLength * FuelperMeters; + fuelPerLap = (tdble) (TrackLength * FuelperMeters); LogSHADOW.info("Strategy fuel per lap = %.2f\n", fuelPerLap); fullfuel = GfParmGetNum(*carParmHandle, SECT_PRIV, PRV_FULL_FUEL, (char*)NULL, 0.0); fuel_Strat = (int)GfParmGetNum(*carParmHandle, SECT_PRIV, PRV_PITSTRAT, (char*)NULL, 0.0); @@ -104,7 +104,7 @@ void SimpleStrategy::setFuelAtRaceStart(tTrack* t, void **carParmHandle, tSituat //raceDist = raceLaps * t->length; //fuelForRace = raceDist * fuelPerMeter; fuelForRace = raceLaps * fuelPerLap; - numPitstop = (tdble) fabs(fuelForRace / maxFuel); + numPitstop = (int) fabs(fuelForRace / maxFuel); if ( numPitstop < fuelForRace / maxFuel ) { numPitstop = numPitstop + 1; @@ -256,7 +256,7 @@ bool SimpleStrategy::needPitstop(tCarElt* car, tSituation *s) int m_maxDamage = PIT_DAMMAGE; float attvalue = 0.0f; // load defined value in xml file of Max Dammage before pitstops for this track - attvalue = GfParmGetNum(car->_carHandle, SECT_PRIV, PRV_DAMAGE, (char*) NULL, PIT_DAMMAGE); + attvalue = GfParmGetNum(car->_carHandle, SECT_PRIV, PRV_DAMAGE, (char*) NULL, (tdble) PIT_DAMMAGE); m_maxDamage = (int)attvalue; // Estimated average fuel per lap //m_Fuel = GfParmGetNum(car->_carHandle, BT_SECT_PRIV, BT_ATT_FUELPERLAP, (char*) NULL, m_expectedfuelperlap); diff --git a/src/modules/graphic/ssggraph/grboard.cpp b/src/modules/graphic/ssggraph/grboard.cpp index 9661e11e2..ff4286727 100644 --- a/src/modules/graphic/ssggraph/grboard.cpp +++ b/src/modules/graphic/ssggraph/grboard.cpp @@ -1848,7 +1848,7 @@ cGrBoard::grGenerateLeaderBoardEntry(const tCarElt *car, const tSituation* s, void cGrBoard::grDispDashboard() { - const char *buf1; + const char *buf1 = NULL; char buf2[9], buf3[9]; int dym = GfuiFontHeight(GFUI_FONT_MEDIUM_C); int y1; @@ -1952,10 +1952,12 @@ cGrBoard::grDispDashboard() // Write information if (car_->_dashboardActiveItem < car_->_dashboardInstantNb) { - GfuiDrawString(buf1, normal_color_, GFUI_FONT_LARGE_C, x1, y1 - dy, 16 * dx, GFUI_ALIGN_HR); + if (buf1) + GfuiDrawString(buf1, normal_color_, GFUI_FONT_LARGE_C, x1, y1 - dy, 16 * dx, GFUI_ALIGN_HR); GfuiDrawString(buf2, danger_color_, GFUI_FONT_LARGE_C, x1 + 16 * dx, y1 - dy, 8 * dx, GFUI_ALIGN_HR); } else { - GfuiDrawString(buf1, normal_color_, GFUI_FONT_LARGE_C, x1, y1 - dy, 16 * dx, GFUI_ALIGN_HR); + if (buf1) + GfuiDrawString(buf1, normal_color_, GFUI_FONT_LARGE_C, x1, y1 - dy, 16 * dx, GFUI_ALIGN_HR); GfuiDrawString(buf2, emphasized_color_, GFUI_FONT_LARGE_C, x1 + 16 * dx, y1 - dy, 8 * dx, GFUI_ALIGN_HR); GfuiDrawString(buf3, ahead_color_, GFUI_FONT_LARGE_C, x1 + 24 * dx, y1 - dy, 8 * dx, GFUI_ALIGN_HR); } diff --git a/src/modules/simu/simuv2.1/car.cpp b/src/modules/simu/simuv2.1/car.cpp index 4990172dd..996dc1e2c 100644 --- a/src/modules/simu/simuv2.1/car.cpp +++ b/src/modules/simu/simuv2.1/car.cpp @@ -476,9 +476,9 @@ SimCarUpdate(tCar *car, tSituation * /* s */) /* update car->carElt->setup.reqRepair with damage */ tCarSetupItem *repair = &(car->carElt->setup.reqRepair); if ((repair->desired_value > 0.0) && (repair->max == repair->desired_value)) { - repair->max = repair->desired_value = car->dammage; + repair->max = repair->desired_value = (tdble) car->dammage; } else { - repair->max = car->dammage; + repair->max = (tdble) car->dammage; } } diff --git a/src/modules/simu/simuv3/car.cpp b/src/modules/simu/simuv3/car.cpp index 92b3b3011..aac22f9f1 100644 --- a/src/modules/simu/simuv3/car.cpp +++ b/src/modules/simu/simuv3/car.cpp @@ -684,9 +684,9 @@ SimCarUpdate(tCar *car, tSituation * /* s */) /* update car->carElt->setup.reqRepair with damage */ tCarSetupItem *repair = &(car->carElt->setup.reqRepair); if ((repair->desired_value > 0.0) && (repair->max == repair->desired_value)) { - repair->max = repair->desired_value = car->dammage; + repair->max = repair->desired_value = (tdble) car->dammage; } else { - repair->max = car->dammage; + repair->max = (tdble) car->dammage; } } diff --git a/src/modules/simu/simuv4/aero.cpp b/src/modules/simu/simuv4/aero.cpp index 6d620b53d..096ba4576 100644 --- a/src/modules/simu/simuv4/aero.cpp +++ b/src/modules/simu/simuv4/aero.cpp @@ -243,7 +243,7 @@ SimWingConfig(tCar *car, int index) setupAngle->desired_value = setupAngle->min = setupAngle->max = 0.0; GfParmGetNumWithLimits(hdle, WingSect[index], PRM_WINGANGLE, (char*)NULL, &(setupAngle->desired_value), &(setupAngle->min), &(setupAngle->max)); setupAngle->changed = TRUE; - setupAngle->stepsize = DEG2RAD(0.1); + setupAngle->stepsize = (tdble) DEG2RAD(0.1); wing->staticPos.x = GfParmGetNum(hdle, WingSect[index], PRM_XPOS, (char*)NULL, 0); wing->staticPos.z = GfParmGetNum(hdle, WingSect[index], PRM_ZPOS, (char*)NULL, 0); wing->staticPos.y = 0.0; diff --git a/src/modules/simu/simuv4/axle.cpp b/src/modules/simu/simuv4/axle.cpp index 6ab4e0913..0d879758a 100644 --- a/src/modules/simu/simuv4/axle.cpp +++ b/src/modules/simu/simuv4/axle.cpp @@ -36,12 +36,12 @@ void SimAxleConfig(tCar *car, int index) setupRideHeightR->desired_value = setupRideHeightR->min = setupRideHeightR->max = 0.20f; GfParmGetNumWithLimits(hdle, WheelSect[index*2], PRM_RIDEHEIGHT, (char*)NULL, &(setupRideHeightR->desired_value), &(setupRideHeightR->min), &(setupRideHeightR->max)); setupRideHeightR->changed = TRUE; - setupRideHeightR->stepsize = 0.001; + setupRideHeightR->stepsize = 0.001f; setupRideHeightL->desired_value = setupRideHeightL->min = setupRideHeightL->max = 0.20f; GfParmGetNumWithLimits(hdle, WheelSect[index*2+1], PRM_RIDEHEIGHT, (char*)NULL, &(setupRideHeightL->desired_value), &(setupRideHeightL->min), &(setupRideHeightL->max)); setupRideHeightL->changed = TRUE; - setupRideHeightL->stepsize = 0.001; + setupRideHeightL->stepsize = 0.001f; if (index == 0) { setupArbK->desired_value = setupArbK->min = setupArbK->max = 175000.0f; diff --git a/src/modules/simu/simuv4/brake.cpp b/src/modules/simu/simuv4/brake.cpp index 7cd87e65f..d7391b818 100644 --- a/src/modules/simu/simuv4/brake.cpp +++ b/src/modules/simu/simuv4/brake.cpp @@ -94,7 +94,7 @@ SimBrakeSystemConfig(tCar *car) setupBrkRep->desired_value = setupBrkRep->min = setupBrkRep->max = 0.5; GfParmGetNumWithLimits(hdle, SECT_BRKSYST, PRM_BRKREP, (char*)NULL, &(setupBrkRep->desired_value), &(setupBrkRep->min), &(setupBrkRep->max)); setupBrkRep->changed = TRUE; - setupBrkRep->stepsize = 0.005; + setupBrkRep->stepsize = 0.005f; setupBrkPress->desired_value = setupBrkPress->min = setupBrkPress->max = 1000000; GfParmGetNumWithLimits(hdle, SECT_BRKSYST, PRM_BRKPRESS, (char*)NULL, &(setupBrkPress->desired_value), &(setupBrkPress->min), &(setupBrkPress->max)); diff --git a/src/modules/simu/simuv4/car.cpp b/src/modules/simu/simuv4/car.cpp index ab4aa6466..9bfbf2273 100644 --- a/src/modules/simu/simuv4/car.cpp +++ b/src/modules/simu/simuv4/car.cpp @@ -95,19 +95,19 @@ SimCarConfig(tCar *car) setupGcfr->desired_value = setupGcfr->min = setupGcfr->max = 0.5; GfParmGetNumWithLimits(hdle, SECT_CAR, PRM_FRWEIGHTREP, (char*)NULL, &(setupGcfr->desired_value), &(setupGcfr->min), &(setupGcfr->max)); setupGcfr->changed = TRUE; - setupGcfr->stepsize = 0.005; + setupGcfr->stepsize = 0.005f; gcfr = setupGcfr->desired_value; setupGcfrl->desired_value = setupGcfrl->min = setupGcfrl->max = 0.5; GfParmGetNumWithLimits(hdle, SECT_CAR, PRM_FRLWEIGHTREP, (char*)NULL, &(setupGcfrl->desired_value), &(setupGcfrl->min), &(setupGcfrl->max)); setupGcfrl->changed = TRUE; - setupGcfrl->stepsize = 0.005; + setupGcfrl->stepsize = 0.005f; gcfrl = setupGcfrl->desired_value; setupGcrrl->desired_value = setupGcrrl->min = setupGcrrl->max = 0.5; GfParmGetNumWithLimits(hdle, SECT_CAR, PRM_RRLWEIGHTREP, (char*)NULL, &(setupGcrrl->desired_value), &(setupGcrrl->min), &(setupGcrrl->max)); setupGcrrl->changed = TRUE; - setupGcrrl->stepsize = 0.005; + setupGcrrl->stepsize = 0.005f; gcrrl = setupGcrrl->desired_value; car->tank = GfParmGetNum(hdle, SECT_CAR, PRM_TANK, (char*)NULL, 80); @@ -931,9 +931,9 @@ SimCarUpdate(tCar *car, tSituation * /* s */) /* update car->carElt->setup.reqRepair with damage */ tCarSetupItem *repair = &(car->carElt->setup.reqRepair); if ((repair->desired_value > 0.0) && (repair->max == repair->desired_value)) { - repair->max = repair->desired_value = car->dammage; + repair->max = repair->desired_value = (tdble) car->dammage; } else { - repair->max = car->dammage; + repair->max = (tdble) car->dammage; } } diff --git a/src/modules/simu/simuv4/differential.cpp b/src/modules/simu/simuv4/differential.cpp index 68c053701..034dcb123 100644 --- a/src/modules/simu/simuv4/differential.cpp +++ b/src/modules/simu/simuv4/differential.cpp @@ -57,22 +57,22 @@ SimDifferentialConfig(tCar *car, int index) setupDRatio->desired_value = setupDRatio->min = setupDRatio->max = 1.0f; GfParmGetNumWithLimits(hdle, section, PRM_RATIO, (char*)NULL, &(setupDRatio->desired_value), &(setupDRatio->min), &(setupDRatio->max)); setupDRatio->changed = TRUE; - setupDRatio->stepsize = 0.1; + setupDRatio->stepsize = 0.1f; setupDMinTB->desired_value = setupDMinTB->min = setupDMinTB->max = 0.05f; GfParmGetNumWithLimits(hdle, section, PRM_MIN_TQ_BIAS, (char*)NULL, &(setupDMinTB->desired_value), &(setupDMinTB->min), &(setupDMinTB->max)); setupDMinTB->changed = TRUE; - setupDMinTB->stepsize = 0.01; + setupDMinTB->stepsize = 0.01f; setupDMaxTB->desired_value = setupDMaxTB->min = setupDMaxTB->max = 0.80f; GfParmGetNumWithLimits(hdle, section, PRM_MAX_TQ_BIAS, (char*)NULL, &(setupDMaxTB->desired_value), &(setupDMaxTB->min), &(setupDMaxTB->max)); setupDMaxTB->changed = TRUE; - setupDMaxTB->stepsize = 0.01; + setupDMaxTB->stepsize = 0.01f; setupDVisc->desired_value = setupDVisc->min = setupDVisc->max = 2.0f; GfParmGetNumWithLimits(hdle, section, PRM_VISCOSITY_FACTOR, (char*)NULL, &(setupDVisc->desired_value), &(setupDVisc->min), &(setupDVisc->max)); setupDVisc->changed = TRUE; - setupDVisc->stepsize = 0.1; + setupDVisc->stepsize = 0.1f; setupDLT->desired_value = setupDLT->min = setupDLT->max = 300.0f; GfParmGetNumWithLimits(hdle, section, PRM_LOCKING_TQ, (char*)NULL, &(setupDLT->desired_value), &(setupDLT->min), &(setupDLT->max)); diff --git a/src/modules/simu/simuv4/engine.cpp b/src/modules/simu/simuv4/engine.cpp index 22016a26f..c33da3bf9 100644 --- a/src/modules/simu/simuv4/engine.cpp +++ b/src/modules/simu/simuv4/engine.cpp @@ -38,7 +38,7 @@ SimEngineConfig(tCar *car) setupRevLimit->desired_value = setupRevLimit->min = setupRevLimit->max = 800; GfParmGetNumWithLimits(hdle, SECT_ENGINE, PRM_REVSLIM, (char*)NULL, &(setupRevLimit->desired_value), &(setupRevLimit->min), &(setupRevLimit->max)); setupRevLimit->changed = TRUE; - setupRevLimit->stepsize = RPM2RADS(100.0); + setupRevLimit->stepsize = (tdble) RPM2RADS(100.0); car->engine.revsLimiter = setupRevLimit->desired_value; car->carElt->_enginerpmRedLine = car->engine.revsLimiter; car->engine.revsMax = GfParmGetNum(hdle, SECT_ENGINE, PRM_REVSMAX, (char*)NULL, 1000); diff --git a/src/modules/simu/simuv4/susp.cpp b/src/modules/simu/simuv4/susp.cpp index 99cd658d0..aefafaad6 100644 --- a/src/modules/simu/simuv4/susp.cpp +++ b/src/modules/simu/simuv4/susp.cpp @@ -167,7 +167,7 @@ void SimSuspConfig(tCar *car, void *hdle, const char *section, tSuspension *susp setupBellcrank->desired_value = setupBellcrank->min = setupBellcrank-> max = 1.0f; GfParmGetNumWithLimits(hdle, section, PRM_BELLCRANK, (char*)NULL, &(setupBellcrank->desired_value), &(setupBellcrank->min), &(setupBellcrank->max)); setupBellcrank->changed = TRUE; - setupBellcrank->stepsize = 0.1; + setupBellcrank->stepsize = 0.1f; setupInertance->desired_value = setupInertance->min = setupInertance-> max = 0.0f; //Inertance is not yet used in car setup files. @@ -197,23 +197,23 @@ void SimSuspConfig(tCar *car, void *hdle, const char *section, tSuspension *susp setupBumpLvel->desired_value = setupBumpLvel->min = setupBumpLvel->max = 0.5f; GfParmGetNumWithLimits(hdle, section, PRM_BUMPLVEL, (char*)NULL, &(setupBumpLvel->desired_value), &(setupBumpLvel->min), &(setupBumpLvel->max)); setupBumpLvel->changed = TRUE; - setupBumpLvel->stepsize = 0.01; + setupBumpLvel->stepsize = 0.01f; setupRebLvel->desired_value = setupRebLvel->min = setupRebLvel->max = 0.5f; GfParmGetNumWithLimits(hdle, section, PRM_REBOUNDLVEL, (char*)NULL, &(setupRebLvel->desired_value), &(setupRebLvel->min), &(setupRebLvel->max)); setupRebLvel->changed = TRUE; - setupRebLvel->stepsize = 0.01; + setupRebLvel->stepsize = 0.01f; if (index<4) { setupCourse->desired_value = setupCourse->min = setupCourse->max = 0.5f; GfParmGetNumWithLimits(hdle, section, PRM_SUSPCOURSE, (char*)NULL, &(setupCourse->desired_value), &(setupCourse->min), &(setupCourse->max)); setupCourse->changed = TRUE; - setupCourse->stepsize = 0.001; + setupCourse->stepsize = 0.001f; setupPacker->desired_value = setupPacker->min = setupPacker->max = 0.0f; GfParmGetNumWithLimits(hdle, section, PRM_PACKERS, (char*)NULL, &(setupPacker->desired_value), &(setupPacker->min), &(setupPacker->max)); setupPacker->changed = TRUE; - setupPacker->stepsize = 0.001; + setupPacker->stepsize = 0.001f; } } diff --git a/src/modules/simu/simuv4/transmission.cpp b/src/modules/simu/simuv4/transmission.cpp index fbdd1b917..d55d30686 100644 --- a/src/modules/simu/simuv4/transmission.cpp +++ b/src/modules/simu/simuv4/transmission.cpp @@ -83,7 +83,7 @@ SimTransmissionConfig(tCar *car) setupGear->desired_value = setupGear->min = setupGear->max = 0.0f; GfParmGetNumWithLimits(hdle, path, PRM_RATIO, (char*)NULL, &(setupGear->desired_value), &(setupGear->min), &(setupGear->max)); setupGear->changed = TRUE; - setupGear->stepsize = 0.01; + setupGear->stepsize = 0.01f; gRatio = setupGear->desired_value; if ((trans->gearbox.gearMax == 0) && (gRatio != 0.0f)) { trans->gearbox.gearMax = i - 1; diff --git a/src/modules/simu/simuv4/wheel.cpp b/src/modules/simu/simuv4/wheel.cpp index 056272098..58279a73f 100644 --- a/src/modules/simu/simuv4/wheel.cpp +++ b/src/modules/simu/simuv4/wheel.cpp @@ -45,12 +45,12 @@ SimWheelConfig(tCar *car, int index) setupToe->desired_value = setupToe->min = setupToe->max = 0.0f; GfParmGetNumWithLimits(hdle, WheelSect[index], PRM_TOE, (char*)NULL, &(setupToe->desired_value), &(setupToe->min), &(setupToe->max)); setupToe->changed = TRUE; - setupToe->stepsize = DEG2RAD(0.1); + setupToe->stepsize = (tdble) DEG2RAD(0.1); setupCamber->desired_value = setupCamber->min = setupCamber->max = 0.0f; GfParmGetNumWithLimits(hdle, WheelSect[index], PRM_CAMBER, (char*)NULL, &(setupCamber->desired_value), &(setupCamber->min), &(setupCamber->max)); setupCamber->changed = TRUE; - setupCamber->stepsize = DEG2RAD(0.1); + setupCamber->stepsize = (tdble) DEG2RAD(0.1); setupPressure->desired_value = setupPressure->min = setupPressure->max = 275600; GfParmGetNumWithLimits(hdle, WheelSect[index], PRM_PRESSURE, (char*)NULL, &(setupPressure->desired_value), &(setupPressure->min), &(setupPressure->max)); @@ -165,14 +165,14 @@ SimWheelConfig(tCar *car, int index) GfLogWarning("Tire magic curve parameters are unphysical!"); } else { for (i = 0; i < 32; i++) { - Bx = 0.5 * (low + high); + Bx = (tdble)(0.5 * (low + high)); if (wheel->mfC * atan(Bx * (1.0f - wheel->mfE) + wheel->mfE * atan(Bx)) < PI_2) { low = Bx; } else { high = Bx; } } - s = 0.5 * (low + high) / wheel->mfB; + s = (tdble)(0.5 * (low + high) / wheel->mfB); } car->carElt->_wheelSlipOpt(index) = s; } diff --git a/src/modules/track/trackv1/track3.cpp b/src/modules/track/trackv1/track3.cpp index 3a7174eaf..342e09c75 100644 --- a/src/modules/track/trackv1/track3.cpp +++ b/src/modules/track/trackv1/track3.cpp @@ -1469,6 +1469,7 @@ ReadTrack3(tTrack *theTrack, void *TrackHandle, tRoadCam **camList, int ext) pits->type = TR_PIT_ON_TRACK_SIDE; pits->nPitSeg = 0; + // If undefined used defaults if (pitBuildingsStart == NULL) pitBuildingsStart = pits->pitStart; if (pitBuildingsEnd == NULL) @@ -1538,53 +1539,57 @@ ReadTrack3(tTrack *theTrack, void *TrackHandle, tRoadCam **camList, int ext) i++; } + /* THIS CODE DOES NOTHING >>> */ for (mSeg = pitStart->prev; mSeg != pitEnd->next->next; mSeg = mSeg->next) { curSeg = curSeg2 = NULL; if ((mSeg != pitStart->prev) && (mSeg != pitEnd->next)) { - if (curSeg) { - curSeg->raceInfo |= TR_PIT | TR_SPEEDLIMIT; - } - if (curSeg2) { - curSeg2->raceInfo |= TR_PIT | TR_SPEEDLIMIT; - } + if (curSeg) { + curSeg->raceInfo |= TR_PIT | TR_SPEEDLIMIT; + } + if (curSeg2) { + curSeg2->raceInfo |= TR_PIT | TR_SPEEDLIMIT; + } } else if (mSeg == pitStart->prev) { - if (curSeg) { - curSeg->raceInfo |= TR_PITSTART; - } - if (curSeg2) { - curSeg2->raceInfo |= TR_PITSTART; - } + if (curSeg) { + curSeg->raceInfo |= TR_PITSTART; + } + if (curSeg2) { + curSeg2->raceInfo |= TR_PITSTART; + } } else if (mSeg == pitEnd->next) { - if (curSeg) { - curSeg->raceInfo |= TR_PITEND; - } - if (curSeg2) { - curSeg2->raceInfo |= TR_PITEND; - } + if (curSeg) { + curSeg->raceInfo |= TR_PITEND; + } + if (curSeg2) { + curSeg2->raceInfo |= TR_PITEND; + } } } - + /* <<< THIS CODE DOES NOTHING */ } for (mSeg = pitBuildingsStart; mSeg != pitBuildingsEnd; mSeg = mSeg->next) { - curSeg2 = NULL; switch(pits->side) { - case TR_RGT: - curSeg = mSeg->rside; - curSeg2 = curSeg->rside; - mSeg->barrier[0]->style = TR_PITBUILDING; - if (curSeg2 != NULL) - curSeg2->raceInfo |= TR_PITBUILD; - break; - case TR_LFT: - curSeg = mSeg->lside; - curSeg2 = curSeg->lside; - mSeg->barrier[1]->style = TR_PITBUILDING; - if (curSeg2 != NULL) - curSeg2->raceInfo |= TR_PITBUILD; - break; - } + case TR_RGT: + mSeg->barrier[0]->style = TR_PITBUILDING; + curSeg = mSeg->rside; + if (curSeg){ + curSeg2 = curSeg->rside; + if (curSeg2 != NULL) + curSeg2->raceInfo |= TR_PITBUILD; + } + break; + case TR_LFT: + mSeg->barrier[1]->style = TR_PITBUILDING; + curSeg = mSeg->lside; + if (curSeg){ + curSeg2 = curSeg->lside; + if (curSeg2 != NULL) + curSeg2->raceInfo |= TR_PITBUILD; + } + break; + } } /* diff --git a/src/modules/track/trackv1/track4.cpp b/src/modules/track/trackv1/track4.cpp index a6a042c25..b4d608e2c 100644 --- a/src/modules/track/trackv1/track4.cpp +++ b/src/modules/track/trackv1/track4.cpp @@ -977,7 +977,9 @@ static void AddPitDoors(tTrack *theTrack, void *TrackHandle, bool found) { case TR_PIT_NO_BUILDING: case TR_PIT_ON_TRACK_SIDE: {//dummy for eliminating warnings of locally declared variables cross-jumping with cases - pits->nPitSeg = 0; + pits->nPitSeg = 0; + + // If undefined used defaults if (pitBuildingsStart == NULL) pitBuildingsStart = pitStart; if (pitBuildingsEnd == NULL) @@ -1084,6 +1086,7 @@ static void AddPitDoors(tTrack *theTrack, void *TrackHandle, bool found) { }//while i GfLogDebug("\n"); + /* THIS CODE DOES NOTHING >>> */ for (mSeg = pitStart->prev; mSeg != pitEnd->next->next; mSeg = mSeg->next) { curSeg = curSeg2 = NULL; @@ -1110,6 +1113,7 @@ static void AddPitDoors(tTrack *theTrack, void *TrackHandle, bool found) { } } }//for mSeg + /* <<< THIS CODE DOES NOTHING */ }//dummy break; @@ -1124,26 +1128,28 @@ static void AddPitDoors(tTrack *theTrack, void *TrackHandle, bool found) { }//if found for (mSeg = pitBuildingsStart; mSeg != pitBuildingsEnd; mSeg = mSeg->next) { - curSeg2 = NULL; - switch(pits->side) { case TR_RGT: - curSeg = mSeg->rside; - curSeg2 = curSeg->rside; mSeg->barrier[0]->style = TR_PITBUILDING; - if (curSeg2 != NULL) - curSeg2->raceInfo |= TR_PITBUILD; + curSeg = mSeg->rside; + if (curSeg){ + curSeg2 = curSeg->rside; + if (curSeg2 != NULL) + curSeg2->raceInfo |= TR_PITBUILD; + } GfLogDebug("%s: mSeg->barrier[0]->style = TR_PITBUILDING\n",mSeg->name); break; case TR_LFT: - curSeg = mSeg->lside; - curSeg2 = curSeg->lside; mSeg->barrier[1]->style = TR_PITBUILDING; - if (curSeg2 != NULL) - curSeg2->raceInfo |= TR_PITBUILD; + curSeg = mSeg->lside; + if (curSeg) { + curSeg2 = curSeg->lside; + if (curSeg2 != NULL) + curSeg2->raceInfo |= TR_PITBUILD; + } GfLogDebug("%s: mSeg->barrier[1]->style = TR_PITBUILDING\n",mSeg->name); - break; + break; }//switch pits->side }//for mSeg } diff --git a/src/modules/track/trackv1/track5.cpp b/src/modules/track/trackv1/track5.cpp index 4844065b0..e4d118c2e 100644 --- a/src/modules/track/trackv1/track5.cpp +++ b/src/modules/track/trackv1/track5.cpp @@ -1011,6 +1011,7 @@ static void AddPitDoors(tTrack *theTrack, void *TrackHandle, bool found) { {//dummy for eliminating warnings of locally declared variables cross-jumping with cases pits->nPitSeg = 0; + // If undefined used defaults if (pitBuildingsStart == NULL) pitBuildingsStart = pitStart; if (pitBuildingsEnd == NULL) @@ -1116,6 +1117,7 @@ static void AddPitDoors(tTrack *theTrack, void *TrackHandle, bool found) { }//while i GfLogDebug("\n"); + /* THIS CODE DOES NOTHING >>> */ for (mSeg = pitStart->prev; mSeg != pitEnd->next->next; mSeg = mSeg->next) { curSeg = curSeg2 = NULL; @@ -1142,6 +1144,7 @@ static void AddPitDoors(tTrack *theTrack, void *TrackHandle, bool found) { } } }//for mSeg + /* <<< THIS CODE DOES NOTHING */ }//dummy break; @@ -1160,19 +1163,23 @@ static void AddPitDoors(tTrack *theTrack, void *TrackHandle, bool found) { switch(pits->side) { case TR_RGT: - curSeg = mSeg->rside; - curSeg2 = curSeg->rside; mSeg->barrier[0]->style = TR_PITBUILDING; - if (curSeg2 != NULL) - curSeg2->raceInfo |= TR_PITBUILD; + curSeg = mSeg->rside; + if (curSeg) { + curSeg2 = curSeg->rside; + if (curSeg2 != NULL) + curSeg2->raceInfo |= TR_PITBUILD; + } break; case TR_LFT: - curSeg = mSeg->lside; - curSeg2 = curSeg->lside; mSeg->barrier[1]->style = TR_PITBUILDING; - if (curSeg2 != NULL) - curSeg2->raceInfo |= TR_PITBUILD; + curSeg = mSeg->lside; + if (curSeg) { + curSeg2 = curSeg->lside; + if (curSeg2 != NULL) + curSeg2->raceInfo |= TR_PITBUILD; + } break; }//switch pits->side }//for mSeg diff --git a/src/modules/userinterface/legacymenu/confscreens/joy2butconfig.cpp b/src/modules/userinterface/legacymenu/confscreens/joy2butconfig.cpp index 9516dcc68..c662981d3 100644 --- a/src/modules/userinterface/legacymenu/confscreens/joy2butconfig.cpp +++ b/src/modules/userinterface/legacymenu/confscreens/joy2butconfig.cpp @@ -98,12 +98,11 @@ static int DoneBut = 0;; static void onNext(void * /* dummy */) { - int index; - /* Release up and running joysticks */ #if SDL_JOYSTICK //GfctrlJoyRelease(joyInfo); #else + int index; for (index = 0; index < GFCTRL_JOY_NUMBER; index++) if (Joystick[index]) { delete Joystick[index]; @@ -348,12 +347,12 @@ static void onActivate(void * /* dummy */) { int i; - int index; #if SDL_JOYSTICK //joyInfo = GfctrlJoyCreate(); GfctrlJoyGetCurrentStates(&joyInfo); #else + int index; // Create and test joysticks ; only keep the up and running ones. for (index = 0; index < GFCTRL_JOY_NUMBER; index++) { Joystick[index] = new jsJoystick(index);