MERGE INCOMING

6 years ago · d064d8d208
parent 733cfe941b
commit d064d8d208
3 changed files with 5 additions and 5 deletions
--- 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");
                    }
--- 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
--- a/core/src/com/dungeoncrawler/view/GameScreen.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");