Skip to content
Snippets Groups Projects
Commit f5021e30 authored by Victor's avatar Victor
Browse files

fix warnings

parent 025bcc2f
Branches standAloneStrategy
No related tags found
No related merge requests found
......@@ -48,10 +48,13 @@ uint8_t tableauEvitement[20][30] =
3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, // 0
};//0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29
*/
ActionGoTo::ActionGoTo(Position goalPos, bool goBack1, float _precision, float stopAtDistance)
: MediumLevelAction(goalPos), command(0), smoothFactor(200.f), stopAtDistance(stopAtDistance)
ActionGoTo::ActionGoTo(Position goalPos, bool a_goBack, float _precision, float stopAtDistance)
: MediumLevelAction(goalPos)
{
goBack = goBack1;
command = 0;
smoothFactor = 200.f;
stopAtDistance = stopAtDistance;
goBack = a_goBack;
goalAngle = 0;
goingCurve = false;
curveFactor = 1;
......@@ -65,7 +68,9 @@ ActionGoTo::~ActionGoTo()
int ActionGoTo::update()
{
#ifndef STANDALONE_STRATEGIE
#ifdef STANDALONE_STRATEGIE
return 0;
#else
if (status == 0)
{
......@@ -162,8 +167,7 @@ int ActionGoTo::update()
status = -1;
}
return status;
#endif
#endif
}
void ActionGoTo::collisionAvoided()
......
......@@ -338,7 +338,9 @@ Etape** Etape::initTableauEtapeTotal(int number)
Etape* Etape::get(int index)
{
if (tableauEtapesTotal[index] == 0)
0;/*new Etape(index);*/
{
/*new Etape(index);*/
}
return tableauEtapesTotal[index];
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment