Merge branch 'master' of https://git.ngb.schule/Tim/Zoelda

Zoelda/src/main/DoorTile.java

@@ -29,7 +29,6 @@ public class DoorTile extends Tile implements Ticker {
 			if (dist < 0.5f) {
 				if (!waitForLeave) {
 					Main.instance.getWorld().changeMap(this);
-					waitForLeave = true;
 				}
 			} else {
 				waitForLeave = false;
@@ -62,10 +61,15 @@ public class DoorTile extends Tile implements Ticker {
 	}
 	
 	@Override
-	public Tile clone() {
+	public DoorTile clone() {
 		DoorTile t = new DoorTile(posX, posY, map);
 		t.setConnectedDoor(connected);
 		t.side = side;
+		t.map = map;
 		return t;
 	}
+
+	public void setMap(ImageMap map) {
+		this.map = map;
+	}
 }

Zoelda/src/main/World.java

@@ -27,11 +27,9 @@ public class World extends Knoten {
 		ImageMap start = new ImageMap("/res/images/maps/map2a.png");
 		dungeon.add(start);
 		currentMap = start;
-		currentMap.start();
-		
 		start.generate(dungeon, DoorTile.BOTTOM);
 		System.out.println("generated!");
-		
+		currentMap.start();
 		
 		player = new Player();
 		currentMap.getEntities().add(player);
@@ -55,10 +53,10 @@ public class World extends Knoten {
 		currentMap.entfernen(player.actionFigur);
 		entfernen(currentMap);
 		currentMap = door.getConnectedDoor().getMap();
-		currentMap.add(player.actionFigur);
 		add(currentMap);
+		currentMap.add(player.actionFigur);
 		currentMap.start();
-		door.getConnectedDoor().waitForLeave();
 		player.setPos(door.getConnectedDoor().posX + 0.5f, door.getConnectedDoor().posY + 0.5f);
+		door.getConnectedDoor().waitForLeave();
 	}
 }

Zoelda/src/main/maps/ImageMap.java

@@ -100,21 +100,24 @@ public class ImageMap extends Map {
 				tiles[x][y] = map.getTile(x, y).clone();
 				if (tiles[x][y] instanceof DoorTile) {
 					DoorTile dt = (DoorTile) tiles[x][y];
-					switch (dt.getSide()) {
+					if (dt.getSide() == DoorTile.TOP) {
-					case DoorTile.TOP:
 						topDoor = dt;
-						break;
+						topDoor.setMap(this);
-					case DoorTile.BOTTOM:
+					}
+					if (dt.getSide() == DoorTile.BOTTOM) {
 						bottomDoor = dt;
-						break;
+						bottomDoor.setMap(this);
-					case DoorTile.LEFT:
+					}
+					if (dt.getSide() == DoorTile.LEFT) {
 						leftDoor = dt;
-						break;
+						leftDoor.setMap(this);
-					case DoorTile.RIGHT:
+					}
+					if (dt.getSide() == DoorTile.RIGHT) {
 						rightDoor = dt;
-						break;
+						rightDoor.setMap(this);
 					}
 				}
+				add(tiles[x][y]);
 			}
 		}
 	}