diff --git a/core/assets/tiledmapData/maps/map2.tmx b/core/assets/tiledmapData/maps/map2.tmx index 68299d8..95e4760 100644 --- a/core/assets/tiledmapData/maps/map2.tmx +++ b/core/assets/tiledmapData/maps/map2.tmx @@ -89,14 +89,6 @@ - - - - - - - - @@ -105,6 +97,14 @@ + + + + + + + + diff --git a/core/src/com/trs/main/Player.java b/core/src/com/trs/main/Player.java index 14e182d..ad2cb28 100644 --- a/core/src/com/trs/main/Player.java +++ b/core/src/com/trs/main/Player.java @@ -236,54 +236,4 @@ public class Player extends Actor{ } return null; } - /* - public int getMovementAvailable(){ - - boolean canMoveVer = true; - boolean canMoveHor = true; - boolean canMoveBoth = true; - for(Actor a : getStage().getActors()){ - if(a.getName().equals("mapobject")){ - Rectangle p = new Rectangle(getX()+movementX, getY() + movementY, getWidth(), getHeight()); - Rectangle o = new Rectangle(a.getX(), a.getY(), a.getWidth(), a.getHeight()); - if(Intersector.overlaps(p, o)){ - canMoveBoth = false; - break; - } - } - } - if(canMoveBoth){ - return 2; - } - - for(Actor a : getStage().getActors()){ - if(a.getName().equals("mapobject")){ - Rectangle p = new Rectangle(getX()+movementX, getY(), getWidth(), getHeight()); - Rectangle o = new Rectangle(a.getX(), a.getY(), a.getWidth(), a.getHeight()); - if(Intersector.overlaps(p, o)){ - canMoveHor = false; - break; - } - } - } - if(canMoveHor){ - return 1; - } - for(Actor a : getStage().getActors()){ - if(a.getName().equals("mapobject")){ - Rectangle p = new Rectangle(getX(), getY()+movementY, getWidth(), getHeight()); - Rectangle o = new Rectangle(a.getX(), a.getY(), a.getWidth(), a.getHeight()); - if(Intersector.overlaps(p, o)){ - canMoveVer = false; - break; - } - } - } - if(canMoveVer){ - return 0; - } - - return 3; - } - */ }