From b4878630cbe9e8623f1da2b675957401e87138c1 Mon Sep 17 00:00:00 2001 From: Jérôme Jutteau Date: Wed, 1 Jun 2011 23:10:24 +0200 Subject: digital/io-hub: moved safe zone in elements --- digital/io-hub/src/robospierre/element.c | 11 +++-------- digital/io-hub/src/robospierre/element.h | 4 +--- 2 files changed, 4 insertions(+), 11 deletions(-) (limited to 'digital/io-hub/src') diff --git a/digital/io-hub/src/robospierre/element.c b/digital/io-hub/src/robospierre/element.c index f73d380d..1529b224 100644 --- a/digital/io-hub/src/robospierre/element.c +++ b/digital/io-hub/src/robospierre/element.c @@ -84,7 +84,7 @@ struct element_t element_table[] = {ELEMENT_ANY, {3000 - 200, 10 + 280 * 1}, ELEMENT_GREEN | ELEMENT_RIGHT, -100}, /* - 32 elements in the middle of a square. + 36 elements in the middle of a square. Altern colors in order to retrieve position % 2. See ELEMENT_UNLOAD_START and ELEMENT_UNLOAD_END */ @@ -118,15 +118,10 @@ struct element_t element_table[] = {ELEMENT_NONE | ELEMENT_ANY, {1500 + 0 * 350 + 175, 1 * 350 + 175}, ELEMENT_CENTER | ELEMENT_LEFT, 0}, {ELEMENT_NONE | ELEMENT_ANY, {1500 + 1 * 350 + 175, 1 * 350 + 175}, ELEMENT_CENTER | ELEMENT_RIGHT, 0}, {ELEMENT_NONE | ELEMENT_ANY, {1500 + 2 * 350 + 175, 1 * 350 + 175}, ELEMENT_CENTER | ELEMENT_LEFT, 0}, - {ELEMENT_NONE | ELEMENT_ANY, {1500 - 175, 175}, ELEMENT_CENTER | ELEMENT_LEFT | ELEMENT_BONUS, 0}, /* middle bonus left, red. */ - {ELEMENT_NONE | ELEMENT_ANY, {1500 + 175, 175}, ELEMENT_CENTER | ELEMENT_RIGHT | ELEMENT_BONUS, 0}, /* middle bonus right, blue. */ - - /* - 4 elements in safe zones. - see ELEMENT_UNLOAD_SAFE_START and ELEMENT_UNLOAD_SAFE_END - */ {ELEMENT_NONE, {1500 - 2 * 350 - 175, 175}, ELEMENT_CENTER | ELEMENT_SAFE | ELEMENT_LEFT, -100}, /* left red */ {ELEMENT_NONE, {1500 - 1 * 350 - 175, 175}, ELEMENT_CENTER | ELEMENT_SAFE | ELEMENT_RIGHT, -100}, /* left blue */ + {ELEMENT_NONE | ELEMENT_ANY, {1500 - 175, 175}, ELEMENT_CENTER | ELEMENT_LEFT | ELEMENT_BONUS, 0}, /* middle bonus left, red. */ + {ELEMENT_NONE | ELEMENT_ANY, {1500 + 175, 175}, ELEMENT_CENTER | ELEMENT_RIGHT | ELEMENT_BONUS, 0}, /* middle bonus right, blue. */ {ELEMENT_NONE, {1500 + 1 * 350 + 175, 175}, ELEMENT_CENTER | ELEMENT_SAFE | ELEMENT_LEFT, -100}, /* right red */ {ELEMENT_NONE, {1500 + 2 * 350 + 175, 175}, ELEMENT_CENTER | ELEMENT_SAFE | ELEMENT_RIGHT, -100} /* right blue */ }; diff --git a/digital/io-hub/src/robospierre/element.h b/digital/io-hub/src/robospierre/element.h index 07cb3b6b..a014b423 100644 --- a/digital/io-hub/src/robospierre/element.h +++ b/digital/io-hub/src/robospierre/element.h @@ -102,9 +102,7 @@ typedef struct element_t element_t; #define ELEMENT_GREEN_START 21 #define ELEMENT_GREEN_END 30 #define ELEMENT_UNLOAD_START 31 -#define ELEMENT_UNLOAD_END 62 -#define ELEMENT_UNLOAD_SAFE_START 63 -#define ELEMENT_UNLOAD_SAFE_END 66 +#define ELEMENT_UNLOAD_END 66 #define ELEMENT_BONUS_COEFF 100 -- cgit v1.2.3