From d8db17d5bb9cc1f45abf953d6783152cc627b874 Mon Sep 17 00:00:00 2001 From: id101010 Date: Wed, 27 Jan 2016 20:48:23 +0100 Subject: [PATCH] Bugfix --- src/game.c | 2 ++ src/player.c | 3 ++- utils/st-util-daemon.sh | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/game.c b/src/game.c index 31b2055..56d5101 100644 --- a/src/game.c +++ b/src/game.c @@ -118,6 +118,8 @@ bool game_check_player_collision(game_t* game, player_t* player, uint8_t pixels) return true; } } + + return false; } bool game_check_collision(game_t* game, player_t* player, uint8_t pixels){ // Check boundary and player collisions diff --git a/src/player.c b/src/player.c index 720999d..176bbbc 100644 --- a/src/player.c +++ b/src/player.c @@ -1,6 +1,7 @@ -#include "player.h" #include +#include "player.h" + void player_init(player_t* player, uint8_t btn_left, uint8_t btn_right, point_t pos, uint16_t color, direction_t direction) { player->color = color; diff --git a/utils/st-util-daemon.sh b/utils/st-util-daemon.sh index f140225..8463ccc 100755 --- a/utils/st-util-daemon.sh +++ b/utils/st-util-daemon.sh @@ -4,7 +4,7 @@ # pid=/tmp/st-util.pid -isp=/dev/stlinkv2_2 +isp=/dev/stlinkv2_8 case "$1" in "start")