diff --git a/bsp/simulator/snake/snake.c b/bsp/simulator/snake/snake.c index a3ec774459f73630de9373be8b1ac28e3e03c2a3..ae25352d1470590025de91d1eef46dd5c958254d 100644 --- a/bsp/simulator/snake/snake.c +++ b/bsp/simulator/snake/snake.c @@ -10,7 +10,7 @@ }while(0) rt_list_t snake_head; -SNAKE_DIR prevdir; +SNAKE_DIR prevdir, newdir; static SNAKE_DIR dir_adjust(SNAKE_DIR dir) { @@ -20,14 +20,14 @@ static SNAKE_DIR dir_adjust(SNAKE_DIR dir) || (SNAKE_DIR_RIGHT == prevdir && SNAKE_DIR_LEFT != dir) ) { - prevdir = dir; + newdir = dir; } else { rt_kprintf("dirction change error\n\r"); } - return prevdir; + return newdir; } static void across_XY(point_t *node, const map_t *map) @@ -77,6 +77,10 @@ static SYS_STE node_update(snake_t *tail, const point_t *node, map_t *map) } map->range[node->y * map->width + node->x] = OVER; + + if (ret != OVER) + prevdir = newdir; + return ret; } diff --git a/bsp/simulator/snake/snake_gui.c b/bsp/simulator/snake/snake_gui.c index 8cbf5a95266cdca9e8df5d71f1539fd18b925590..6e0ba91cd4bf4bb207a73d7ac8d6904b5e32af17 100644 --- a/bsp/simulator/snake/snake_gui.c +++ b/bsp/simulator/snake/snake_gui.c @@ -324,11 +324,16 @@ static rt_bool_t event_handler(struct rtgui_object *object, rtgui_event_t *event static void timeout(struct rtgui_timer *timer, void *parameter) { struct rtgui_widget *widget; - + SYS_STE ret; + if (!map) return; - if (snake_step(run_state, map) == FOOD) + ret = snake_step(run_state, map); + if (OVER == ret) + return; + + if (FOOD == ret) { snake_len++; if (snake_len >= (map->width * map->height) / 3) @@ -350,7 +355,7 @@ static void timeout(struct rtgui_timer *timer, void *parameter) food_init(map, 1); } - + widget = RTGUI_WIDGET(parameter); snake_update(widget); }