summaryrefslogtreecommitdiff
path: root/2004/i/nono/src/ovision/map.cc
diff options
context:
space:
mode:
Diffstat (limited to '2004/i/nono/src/ovision/map.cc')
-rw-r--r--2004/i/nono/src/ovision/map.cc15
1 files changed, 8 insertions, 7 deletions
diff --git a/2004/i/nono/src/ovision/map.cc b/2004/i/nono/src/ovision/map.cc
index 288ce52..7f087a0 100644
--- a/2004/i/nono/src/ovision/map.cc
+++ b/2004/i/nono/src/ovision/map.cc
@@ -13,11 +13,12 @@ using namespace std;
/// Constructeurs.
-Map::Map (OConfig *config)
+Map::Map (OConfig *config, Space *space)
{
lock = 0;
Map::config = config;
+ Map::space = space;
posGoal[0] = 105;
posGoal[1] = 0;
@@ -31,10 +32,10 @@ Map::~Map (void)
/// Accessors
const std::list<BALL>::iterator &
-Map::GetCurBall() const
+Map::GetCurBall()
{
checkCurBall = false;
- return CurBall;
+ return curBall;
}
@@ -100,7 +101,7 @@ Map::IsLock()
/// Lock une balle pour savoir quel balle le robot suit
void
-Map::SetLock(int value)
+Map::SetLock(bool value)
{
lock = value;
}
@@ -115,7 +116,7 @@ Map::AddBallsToMap(Group *group)
while (pCur)
{
- if (!Islock())
+ if (!IsLock())
{
pos[0] = pCur->centerx-180;
pos[1] = pCur->centery;
@@ -140,9 +141,9 @@ Map::AddBallsToMap(Group *group)
if (iCur->skepticism < config->skepticism_max)
iCur->skepticism++;
- }
+ } */
pCur = pCur->next;
- */ }
+ }
// TODO decremente d'autre marqueur