From d064d8d20800813ce37ba6df7c63ea313b516bba Mon Sep 17 00:00:00 2001
From: GammelJan <jan.ehehalt@gmail.com>
Date: Thu, 9 Apr 2020 11:37:34 +0200
Subject: [PATCH] MERGE INCOMING

---
 core/src/com/dungeoncrawler/control/Controller.java           | 4 ++--
 core/src/com/dungeoncrawler/model/Entity.java                 | 2 +-
 .../com/dungeoncrawler/view/{View.java => GameScreen.java}    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename core/src/com/dungeoncrawler/view/{View.java => GameScreen.java} (99%)

diff --git a/core/src/com/dungeoncrawler/control/Controller.java b/core/src/com/dungeoncrawler/control/Controller.java
index 270571f..099a697 100644
--- a/core/src/com/dungeoncrawler/control/Controller.java
+++ b/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");
                     }
diff --git a/core/src/com/dungeoncrawler/model/Entity.java b/core/src/com/dungeoncrawler/model/Entity.java
index 5c35228..de6eefc 100644
--- a/core/src/com/dungeoncrawler/model/Entity.java
+++ b/core/src/com/dungeoncrawler/model/Entity.java
@@ -75,7 +75,7 @@ public abstract class Entity {
                         movementX = -1f;                            //        //  //
                     }                                               //        //  //
                     else{                                           //        //  //Weg zu PLAYER y kuerzer als zu PLAYER x
-                        movementY = -1f;                            //       //
+                        movementY = -1f;                            //        //
                     }                                               //        //
                 }                                                   //        //
                 else if(yPlayer > yPos){                            //        //PLAYER ist im Quadrant IV
diff --git a/core/src/com/dungeoncrawler/view/View.java b/core/src/com/dungeoncrawler/view/GameScreen.java
similarity index 99%
rename from core/src/com/dungeoncrawler/view/View.java
rename to core/src/com/dungeoncrawler/view/GameScreen.java
index 917919c..eebff22 100644
--- a/core/src/com/dungeoncrawler/view/View.java
+++ b/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");