fixed a problem where a barrier could spawn overtop of the first food position

1 files changed, 11 insertions, 12 deletions

diff --git a/snake.c b/snake.c
index a755454..b3deee2 100644
--- a/snake.c
+++ b/snake.c
@@ -133,6 +133,9 @@ int main(int argc, char **argv) {
 							overlap = 1;
 						}
 					}
+					if(foodPos.mx == voxelPos.mx && foodPos.my == voxelPos.my) {
+							overlap = 1;
+					}
 				}
 			}
 			if(overlap) {
@@ -182,11 +185,6 @@ int main(int argc, char **argv) {
 			lastMoveDir = dir;
 		}
 		/* check if snake landed on an obstacle */
-		for(int i = 0; i < obstaclePositions.length; i++) {
-			if((snakePositions.vectors[0].mx + lastMoveDir.mx == obstaclePositions.vectors[i].mx) && (snakePositions.vectors[0].my + lastMoveDir.my == obstaclePositions.vectors[i].my)) {
-				goto EXIT;
-			}
-		}
 		int ateFood = 0;
 		/* check if snake landed on the food */
 		if((snakePositions.vectors[0].mx + lastMoveDir.mx == foodPos.mx) && (snakePositions.vectors[0].my + lastMoveDir.my == foodPos.my)) {
@@ -198,15 +196,15 @@ int main(int argc, char **argv) {
 			/* move the food */
 			while(1) {
 				foodPos = init_vector(1 + (rand() % (boardSize - 2)), 1 + (rand() % (boardSize - 2)));
-				/* if food overlaps snake, try again */
+				/* if food overlaps snake or obstacles, try again */
 				int overlap = 0;
 				for(int i = 0; i < snakePositions.length; i++) {
 					if((snakePositions.vectors[i].mx == foodPos.mx) && (snakePositions.vectors[i].my == foodPos.my)) {
 						overlap = 1;
 					}
 				}
-				for (int i = 0; i < obstaclePositions.length; i ++) {
-					if ((obstaclePositions.vectors[i].mx == foodPos.mx) && (obstaclePositions.vectors[i].my == foodPos.my)) {
+				for(int i = 0; i < obstaclePositions.length; i++) {
+					if((obstaclePositions.vectors[i].mx == foodPos.mx) && (obstaclePositions.vectors[i].my == foodPos.my)) {
 						overlap = 1;
 					}
 				}
@@ -220,15 +218,16 @@ int main(int argc, char **argv) {
 		free(snakePositions.vectors);
 		snakePositions = newSnakePositions;
 		/* check if snake landed on self */
-		int died = 0;
 		for(int i = 1; i < snakePositions.length; i++) {
 			if(snakePositions.vectors[0].mx == snakePositions.vectors[i].mx && snakePositions.vectors[0].my == snakePositions.vectors[i].my) {
 				/* game over */
-				died = 1;
+				goto EXIT;
 			}
 		}
-		if(died) {
-			break;
+		for(int i = 0; i < obstaclePositions.length; i++) {
+			if((snakePositions.vectors[0].mx + lastMoveDir.mx == obstaclePositions.vectors[i].mx) && (snakePositions.vectors[0].my + lastMoveDir.my == obstaclePositions.vectors[i].my)) {
+				goto EXIT;
+			}
 		}
 	}
 EXIT: