diff options
Diffstat (limited to '')
3 files changed, 8 insertions, 7 deletions
diff --git a/pacman/model/src/main/java/com/gr15/pacman/model/Board.java b/pacman/model/src/main/java/com/gr15/pacman/model/Board.java index 898ec3b..399ddfc 100644 --- a/pacman/model/src/main/java/com/gr15/pacman/model/Board.java +++ b/pacman/model/src/main/java/com/gr15/pacman/model/Board.java @@ -11,13 +11,13 @@ public class Board { public enum TileType { WALL, EMPTY }; - public Board(int height, int width) { + public Board(int width, int height) { this.width = width; this.height = height; } - public Board(int height, int width, TileType[][] tileBoard) { - this(height, width); + public Board(int width, int height, TileType[][] tileBoard) { + this(width, height); this.tileBoard = tileBoard; } diff --git a/pacman/model/src/main/java/com/gr15/pacman/model/GameStateBuilder.java b/pacman/model/src/main/java/com/gr15/pacman/model/GameStateBuilder.java index aab7dd9..b9a64cd 100644 --- a/pacman/model/src/main/java/com/gr15/pacman/model/GameStateBuilder.java +++ b/pacman/model/src/main/java/com/gr15/pacman/model/GameStateBuilder.java @@ -5,6 +5,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import org.json.JSONArray; @@ -12,7 +13,7 @@ import org.json.JSONException; import org.json.JSONObject; import org.json.JSONTokener; -import com.gr15.pacman.model.Board.Direction; +import com.gr15.pacman.model.entities.Entity.Direction; import com.gr15.pacman.model.Board.TileType; import com.gr15.pacman.model.entities.Entity; import com.gr15.pacman.model.entities.Ghost; @@ -106,7 +107,7 @@ public class GameStateBuilder { pacmanJsonObject.getInt("y")); Pacman pacman = new Pacman(pacmanStartPos, speed, Direction.NONE, radius); - ArrayList<Entity> entities = new ArrayList<>(); + List<Entity> entities = new ArrayList<>(); Map<Position, Items> items = new HashMap<>(); return new GameState(board, pacman, entities, items); diff --git a/pacman/model/src/main/java/com/gr15/pacman/model/entities/Entity.java b/pacman/model/src/main/java/com/gr15/pacman/model/entities/Entity.java index daf0eef..0792219 100644 --- a/pacman/model/src/main/java/com/gr15/pacman/model/entities/Entity.java +++ b/pacman/model/src/main/java/com/gr15/pacman/model/entities/Entity.java @@ -9,8 +9,8 @@ import com.gr15.pacman.model.Position; public abstract class Entity { private Position position; - private float subTileX = 0.0f; - private float subTileY = 0.0f; + private float subTileX = 0.5f; + private float subTileY = 0.5f; private double radius; |