summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJérôme Jutteau2011-06-01 23:45:25 +0200
committerJérôme Jutteau2011-06-01 23:45:25 +0200
commit719fd6e016ac32955e3b95111a42e992897b14f5 (patch)
treed270742956896e4f9519d996d72018403f6d46dc
parent4307b557e5be14c42a1335abce5149712923733a (diff)
digital/io-hub: fixed bonus elements at bottom
-rw-r--r--digital/io-hub/src/robospierre/element.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/digital/io-hub/src/robospierre/element.c b/digital/io-hub/src/robospierre/element.c
index 2530454c..a9d8808a 100644
--- a/digital/io-hub/src/robospierre/element.c
+++ b/digital/io-hub/src/robospierre/element.c
@@ -120,8 +120,8 @@ struct element_t element_table[] =
{ELEMENT_NONE | ELEMENT_ANY, {1500 + 2 * 350 + 175, 1 * 350 + 175}, ELEMENT_CENTER | ELEMENT_LEFT, 0},
{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 | ELEMENT_ANY, {1500 - 175, 175}, ELEMENT_CENTER | ELEMENT_LEFT | ELEMENT_BONUS, -40}, /* middle bonus left, red. */
+ {ELEMENT_NONE | ELEMENT_ANY, {1500 + 175, 175}, ELEMENT_CENTER | ELEMENT_RIGHT | ELEMENT_BONUS, -40}, /* 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 */
};
@@ -379,8 +379,6 @@ element_proba (uint8_t element_id)
{
p_pos = (element_id - ELEMENT_UNLOAD_START) / 2 + 1;
out = (1000 - p_t) * p_pos;
- if (e.attr & ELEMENT_BONUS)
- out += 1000;
}
}