MERGE INCOMING

core/src/com/dungeoncrawler/control/Controller.java

@@ -24,7 +24,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
     MainMenu v;
     Entity[] e;
     Timer t;
-    View m;
+    GameScreen m;
     Archer a;
     int[] tile;
     int[] posRoom;
@@ -246,7 +246,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
                     if(v.click() == -1){}
                     else if(v.click() == 0){
                         v = null;
-                        m = new View(d);
+                        m = new GameScreen(d);
                         
                         System.out.println("NICE");
                     }

core/src/com/dungeoncrawler/view/GameScreen.java

@@ -14,7 +14,7 @@ import com.dungeoncrawler.model.Dungeon;
 import com.dungeoncrawler.model.Entity;
 import com.dungeoncrawler.model.entities.*;
 
-public class View {
+public class GameScreen {
         //PLAYER
         Texture p;
         Sprite player;
@@ -32,7 +32,7 @@ public class View {
         TiledMap tm;
         OrthographicCamera camera;
         
-	public View(Dungeon d) {
+	public GameScreen(Dungeon d) {
             
                 //PLAYER
                 p = new Texture("Player.png");