forked from speed-dreams/speed-dreams-code
Re #720 Fixed GCC warnings
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5363 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: 17700f448a371a6458a1c0671b0ba90c835a6c68 Former-commit-id: 67f938cfdba83f66567ae4bc91bab7260f8ff223
This commit is contained in:
parent
e646f5ae6a
commit
5010521419
4 changed files with 13 additions and 13 deletions
|
@ -22,7 +22,7 @@
|
||||||
//
|
//
|
||||||
// Copyright: (C) 2002-2004 Bernhard Wymann
|
// Copyright: (C) 2002-2004 Bernhard Wymann
|
||||||
// eMail : berniw@bluewin.ch
|
// eMail : berniw@bluewin.ch
|
||||||
//f
|
//
|
||||||
// dem Roboter delphin
|
// dem Roboter delphin
|
||||||
//
|
//
|
||||||
// Copyright: (C) 2006-2007 Wolf-Dieter Beelitz
|
// Copyright: (C) 2006-2007 Wolf-Dieter Beelitz
|
||||||
|
@ -239,8 +239,8 @@ TDriver::TDriver(int Index):
|
||||||
oWingAngleRearBrake(0),
|
oWingAngleRearBrake(0),
|
||||||
oBrakeMaxPressRatio(0.85f),
|
oBrakeMaxPressRatio(0.85f),
|
||||||
oBrakeRep(0.5f),
|
oBrakeRep(0.5f),
|
||||||
oBrakeCorrLR(0.30f),
|
|
||||||
oBrakeCorrFR(0.03f),
|
oBrakeCorrFR(0.03f),
|
||||||
|
oBrakeCorrLR(0.30f),
|
||||||
oBrakeFront(1.0f),
|
oBrakeFront(1.0f),
|
||||||
oBrakeRear(1.0f),
|
oBrakeRear(1.0f),
|
||||||
oBrakeLeft(1.0f),
|
oBrakeLeft(1.0f),
|
||||||
|
|
|
@ -727,11 +727,11 @@ real ANN_RBFBackpropagate(LISTITEM * p, real * d, bool use_eligibility, real TD)
|
||||||
{
|
{
|
||||||
int i, j;
|
int i, j;
|
||||||
real f;
|
real f;
|
||||||
real a;
|
// real a;
|
||||||
Layer *l = (Layer *) p->obj;
|
Layer *l = (Layer *) p->obj;
|
||||||
LISTITEM *back = p->prev;
|
LISTITEM *back = p->prev;
|
||||||
Layer *back_layer = NULL;
|
Layer *back_layer = NULL;
|
||||||
a = l->a;
|
// a = l->a;
|
||||||
|
|
||||||
if (back) {
|
if (back) {
|
||||||
back_layer = (Layer *) back->obj;
|
back_layer = (Layer *) back->obj;
|
||||||
|
|
|
@ -1212,7 +1212,7 @@ grDrawCar(tSituation *s, tCarElt *car, tCarElt *curCar, int dispCarFlag, int dis
|
||||||
{
|
{
|
||||||
// choose a rearwing model to display
|
// choose a rearwing model to display
|
||||||
int curDRM = 0;
|
int curDRM = 0;
|
||||||
float curAngle = 0.0f;
|
//float curAngle = 0.0f;
|
||||||
//int lastDRM = grCarInfo[index].DRMSelector->getSelect();
|
//int lastDRM = grCarInfo[index].DRMSelector->getSelect();
|
||||||
|
|
||||||
for (i=0; i<grCarInfo[index].nDRM; i++)
|
for (i=0; i<grCarInfo[index].nDRM; i++)
|
||||||
|
@ -1224,7 +1224,7 @@ grDrawCar(tSituation *s, tCarElt *car, tCarElt *curCar, int dispCarFlag, int dis
|
||||||
&& (grCarInfo[index].DRMThreshold[i] <= 10.0))
|
&& (grCarInfo[index].DRMThreshold[i] <= 10.0))
|
||||||
{
|
{
|
||||||
curDRM = i;
|
curDRM = i;
|
||||||
curAngle = grCarInfo[index].DRMThreshold[i];
|
//curAngle = grCarInfo[index].DRMThreshold[i];
|
||||||
}
|
}
|
||||||
else if ((wingangle > 10.0)
|
else if ((wingangle > 10.0)
|
||||||
&& (wingangle < 35.0)
|
&& (wingangle < 35.0)
|
||||||
|
@ -1232,13 +1232,13 @@ grDrawCar(tSituation *s, tCarElt *car, tCarElt *curCar, int dispCarFlag, int dis
|
||||||
&& (grCarInfo[index].DRMThreshold[i] <= 35.0))
|
&& (grCarInfo[index].DRMThreshold[i] <= 35.0))
|
||||||
{
|
{
|
||||||
curDRM = i;
|
curDRM = i;
|
||||||
curAngle = grCarInfo[index].DRMThreshold[i];
|
//curAngle = grCarInfo[index].DRMThreshold[i];
|
||||||
}
|
}
|
||||||
else if ((wingangle > 35.0)
|
else if ((wingangle > 35.0)
|
||||||
&& (grCarInfo[index].DRMThreshold[i] > 35.0))
|
&& (grCarInfo[index].DRMThreshold[i] > 35.0))
|
||||||
{
|
{
|
||||||
curDRM = i;
|
curDRM = i;
|
||||||
curAngle = grCarInfo[index].DRMThreshold[i];
|
//curAngle = grCarInfo[index].DRMThreshold[i];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -304,9 +304,9 @@ static void
|
||||||
SimCarUpdateSpeed(tCar *car)
|
SimCarUpdateSpeed(tCar *car)
|
||||||
{
|
{
|
||||||
tdble Cosz, Sinz;
|
tdble Cosz, Sinz;
|
||||||
tdble mass;
|
//tdble mass;
|
||||||
|
|
||||||
mass = car->mass + car->fuel;
|
//mass = car->mass + car->fuel;
|
||||||
|
|
||||||
Cosz = car->Cosz;
|
Cosz = car->Cosz;
|
||||||
Sinz = car->Sinz;
|
Sinz = car->Sinz;
|
||||||
|
@ -370,13 +370,13 @@ static void
|
||||||
SimCarUpdatePos(tCar *car)
|
SimCarUpdatePos(tCar *car)
|
||||||
{
|
{
|
||||||
tdble vx, vy;
|
tdble vx, vy;
|
||||||
tdble accx, accy;
|
//tdble accx, accy;
|
||||||
|
|
||||||
vx = car->DynGCg.vel.x;
|
vx = car->DynGCg.vel.x;
|
||||||
vy = car->DynGCg.vel.y;
|
vy = car->DynGCg.vel.y;
|
||||||
|
|
||||||
accx = car->DynGCg.acc.x;
|
//accx = car->DynGCg.acc.x;
|
||||||
accy = car->DynGCg.acc.y;
|
//accy = car->DynGCg.acc.y;
|
||||||
|
|
||||||
car->DynGCg.pos.x += vx * SimDeltaTime;
|
car->DynGCg.pos.x += vx * SimDeltaTime;
|
||||||
car->DynGCg.pos.y += vy * SimDeltaTime;
|
car->DynGCg.pos.y += vy * SimDeltaTime;
|
||||||
|
|
Loading…
Reference in a new issue