From 0ed148d9828f1a7765d7c1ea1be49bc007bd8c92 Mon Sep 17 00:00:00 2001
From: Jonathan Hager <jonathan.hager@protonmail.com>
Date: Fri, 24 Apr 2020 12:44:59 +0200
Subject: [PATCH] vor merge

---
 core/src/com/dungeoncrawler/control/Controller.java     | 5 ++---
 core/src/com/dungeoncrawler/model/DungeonGenerator.java | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/src/com/dungeoncrawler/control/Controller.java b/core/src/com/dungeoncrawler/control/Controller.java
index 9a0bff9..2c1ecef 100644
--- a/core/src/com/dungeoncrawler/control/Controller.java
+++ b/core/src/com/dungeoncrawler/control/Controller.java
@@ -112,6 +112,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
         if(m != null){
             
             if(v == null){
+                e = d.getLevel()[level].getRooms()[posRoom[0]][posRoom[1]].getEnemies();
                 // Position des Players, etc. werden aktualisiert
                 updateObjects(level, posRoom);
                 
@@ -120,9 +121,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
 
                 
                 // Render methode zum rendern der einzelnen Sprites wird aufgerufen
-                Entity[] lol = d.getLevel()[level].getRooms()[posRoom[0]][posRoom[1]].getEnemies();
-                
-                m.render(batch, d.getPlayer(), lol, arrows,  tile, level, posRoom);
+                m.render(batch, d.getPlayer(), e, arrows,  tile, level, posRoom);
             }
         }
     }
diff --git a/core/src/com/dungeoncrawler/model/DungeonGenerator.java b/core/src/com/dungeoncrawler/model/DungeonGenerator.java
index d4ed347..348b51b 100644
--- a/core/src/com/dungeoncrawler/model/DungeonGenerator.java
+++ b/core/src/com/dungeoncrawler/model/DungeonGenerator.java
@@ -178,7 +178,7 @@ public class DungeonGenerator {
     }
     
     private int generateTile(int size){
-        int tile = (int) (Math.random() * size);
+        int tile = ((int) (Math.random() * size) + 1);
         return tile;
     }