Doors fixed + merge

core/assets/tiledmapData/maps/map2.tmx

@@ -89,7 +89,7 @@
   <object id="14" x="12.5" y="1" width="363.5" height="7"/>
  </objectgroup>
  <objectgroup id="7" name="DoorRects">
- <object id="16" x="160" y="311.5" width="64" height="9">
+  <object id="16" x="160" y="311.5" width="64" height="9">
    <properties>
     <property name="destinationDoor" type="int" value="1"/>
     <property name="destinationMap" type="int" value="1"/>

core/src/com/trs/main/Player.java

@@ -238,54 +238,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;
-    }
-    */
 }