robodim.h: ACROPOLIS_CENTER_X, resp ..._Y coords defined

diff --git a/src/robodim/robodim.h b/src/robodim/robodim.h
index b3f6740a34a1a45583fee4d1f015472e2af8ad1f..6b230d57c81e6b73d7bd180111cf78656493cf41 100644 (file)
--- a/src/robodim/robodim.h
+++ b/src/robodim/robodim.h
@@ -95,6 +95,8 @@
 #define PLAYGROUND_HEIGHT_MM   2100
 #define PLAYGROUND_HEIGHT_M    (PLAYGROUND_HEIGHT_MM/1000.0)
 
+#define ACROPOLIS_CENTER_X     (PLAYGROUND_WIDTH_M/2.0)
+#define ACROPOLIS_CENTER_Y     (PLAYGROUND_HEIGHT_M/2.0)
 #define ACROPOLIS_RADIUS       0.35
 
 /**

diff --git a/src/robofsm/robot.c b/src/robofsm/robot.c
index 14b6b4e0ef487c833f23e88e1129d5fdce6915ea..c2e70cf3adb20e2c20fde3a438e2f11fba18adb5 100644 (file)
--- a/src/robofsm/robot.c
+++ b/src/robofsm/robot.c
@@ -80,9 +80,7 @@ void fill_in_known_areas_in_map()
        //ShmapSetRectangleFlag(2.8, 0.0, 3.0, 0.6, MAP_FLAG_IGNORE_OBST, 0); /* right basket */
 
        /* Construction areas (Building zones) */
-       double x_center = (PLAYGROUND_WIDTH_M/2.0);
-       double y_center = (PLAYGROUND_HEIGHT_M/2.0);
-       //ShmapSetRectangleFlag(x_center - ACROPOLIS_RADIUS, y_center - ACROPOLIS_RADIUS, x_center + ACROPOLIS_RADIUS, y_center + ACROPOLIS_RADIUS, MAP_FLAG_WALL, 0);           /* Central construction area */
+       //ShmapSetRectangleFlag(ACROPOLIS_CENTER_X - ACROPOLIS_RADIUS, ACROPOLIS_CENTER_Y - ACROPOLIS_RADIUS, ACROPOLIS_CENTER_X + ACROPOLIS_RADIUS, ACROPOLIS_CENTER_Y + ACROPOLIS_RADIUS, MAP_FLAG_WALL, 0);           /* Central construction area */
        //ShmapSetRectangleFlag(1.35, 0.9, 1.65, 1.2, MAP_FLAG_WALL, 0);                 /* Central construction area */
 
        // Enclosure wall
@@ -96,7 +94,7 @@ void fill_in_known_areas_in_map()
        ShmapSetRectangleFlag(0.4, 0.0, 0.8, 0.3, MAP_FLAG_WALL, 0); 
        ShmapSetRectangleFlag(2.2, 0.0, 2.6, 0.3, MAP_FLAG_WALL, 0); 
        // Acropolis wall
-       ShmapSetCircleFlag(x_center, y_center, ACROPOLIS_RADIUS + 0.04, MAP_FLAG_WALL, 0); 
+       ShmapSetCircleFlag(ACROPOLIS_CENTER_X, ACROPOLIS_CENTER_Y, ACROPOLIS_RADIUS + 0.04, MAP_FLAG_WALL, 0); 
 
 }