From e4f860bb81377ef7a6a60c0ccd55e3688eb5af94 Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Sat, 4 Jun 2011 01:09:26 +0200 Subject: digital/io-hub: fix failure code There is still a bug (when 0), but I do not care that much. --- digital/io-hub/src/robospierre/element.c | 4 ++-- digital/io-hub/src/robospierre/element.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'digital') diff --git a/digital/io-hub/src/robospierre/element.c b/digital/io-hub/src/robospierre/element.c index 3c73a72c..35bf73f9 100644 --- a/digital/io-hub/src/robospierre/element.c +++ b/digital/io-hub/src/robospierre/element.c @@ -198,7 +198,7 @@ element_unload_score (position_t robot_pos, uint8_t element_id) /* Failed element. */ if (e.failure_until_s - && e.failure_until_s + failure_offset_s < chrono_remaining_time () / 1000) + && e.failure_until_s + failure_offset_s < (int) (chrono_remaining_time () / 1000)) return -1; /* Bonus adjust. */ @@ -277,7 +277,7 @@ element_score (position_t robot_pos, uint8_t element_id) /* Failed element. */ if (e.failure_until_s - && e.failure_until_s + failure_offset_s < chrono_remaining_time () / 1000) + && e.failure_until_s + failure_offset_s < (int) (chrono_remaining_time () / 1000)) return -1; if (e.type == ELEMENT_KING) diff --git a/digital/io-hub/src/robospierre/element.h b/digital/io-hub/src/robospierre/element.h index 5b6ad9a4..f9420cdb 100644 --- a/digital/io-hub/src/robospierre/element.h +++ b/digital/io-hub/src/robospierre/element.h @@ -96,7 +96,7 @@ struct element_t int8_t bonus_unload; /** Failure expiration date, can not take this element until chrono is * lower than this date in seconds. */ - uint8_t failure_until_s; + int8_t failure_until_s; }; typedef struct element_t element_t; -- cgit v1.2.3