X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=projects%2Fmicrob2010%2Fmainboard%2Fstrat_utils.h;h=020b7f1e2f4a0ee8c90e69504fad532211ea827d;hb=f5502f60124c62801685777bb7c699bdfb7e1166;hp=7502a4355e8d70fbba17668cbe52e114ca3b697f;hpb=fa8546ea39c7442ad3bf5a822a72a2b50a41045d;p=aversive.git

diff --git a/projects/microb2010/mainboard/strat_utils.h b/projects/microb2010/mainboard/strat_utils.h
index 7502a43..020b7f1 100644
--- a/projects/microb2010/mainboard/strat_utils.h
+++ b/projects/microb2010/mainboard/strat_utils.h
@@ -31,7 +31,7 @@ struct xy_point {
 	({								\
 		uint8_t __err = 0;					\
 		while ( (! (cond)) && (__err == 0)) {			\
-			__err = test_traj_end(TRAJ_FLAGS_NO_NEAR);	\
+			__err = test_traj_end(mask);			\
 		}							\
 		__err;							\
 	})								\
@@ -57,4 +57,8 @@ uint8_t get_opponent_color(void);
 int8_t get_opponent_xy(int16_t *x, int16_t *y);
 int8_t get_opponent_da(int16_t *d, int16_t *a);
 int8_t get_opponent_xyda(int16_t *x, int16_t *y, int16_t *d, int16_t *a);
+int16_t distance_from_opponent(int16_t x, int16_t y);
 uint8_t opponent_is_behind(void);
+
+uint8_t get_ball_count(void);
+uint8_t get_cob_count(void);