From 40854a4d792ffa3a98112d588927008e2bb7a115 Mon Sep 17 00:00:00 2001 From: Billy Gallagher Date: Fri, 22 Apr 2016 18:52:33 -0400 Subject: [PATCH] Updated readme, added comment. Collision checking are done, post-collision actions need to be finished --- README.md | 2 +- src/game/level/Level.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fd447fb..09c5bfc 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ * [x] Tile/Wall rendering * [x] Basic level loading (hard-coded levels) * [ ] Advanced level loading (stored in text files) -* [ ] Collision checking +* [x] Collision checking * [ ] Menus * [ ] Main menu * [ ] Pausing diff --git a/src/game/level/Level.java b/src/game/level/Level.java index 5b12c7a..131a9da 100644 --- a/src/game/level/Level.java +++ b/src/game/level/Level.java @@ -101,8 +101,8 @@ public class Level { private void playerWallCollisions() { // Check for collisions, flip flag, if flag is true move player -// boolean collided = false; + //TODO: Make this better and stop sending player to middle. for (Tile[] tileRow : tiles) { for (Tile tile : tileRow) { if (tile.isWall()) {